[freenet-cvs] r11773 - trunk/freenet/src/freenet/keys

[t...@freenetproject.org]

Author: toad
Date: 2007-02-13 23:11:03 +0000 (Tue, 13 Feb 2007)
New Revision: 11773

Modified:
   trunk/freenet/src/freenet/keys/InsertableClientSSK.java
Log:
Catch a bug earlier.

Modified: trunk/freenet/src/freenet/keys/InsertableClientSSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/InsertableClientSSK.java     2007-02-13 
23:04:35 UTC (rev 11772)
+++ trunk/freenet/src/freenet/keys/InsertableClientSSK.java     2007-02-13 
23:11:03 UTC (rev 11773)
@@ -38,6 +38,11 @@
        public static InsertableClientSSK create(FreenetURI uri) throws 
MalformedURLException {
                if(uri.getKeyType().equalsIgnoreCase("KSK"))
                        return ClientKSK.create(uri);
+
+               if(uri.getRoutingKey() == null)
+                       throw new MalformedURLException("Insertable SSK URIs 
must have a private key!: "+uri);
+               if(uri.getCryptoKey() == null)
+                       throw new MalformedURLException("Insertable SSK URIs 
must have a private key!: "+uri);

                byte keyType;

@@ -67,10 +72,7 @@
                DSAGroup g = Global.DSAgroupBigA;
                DSAPrivateKey privKey = new DSAPrivateKey(new 
NativeBigInteger(1, uri.getRoutingKey()));
                DSAPublicKey pubKey = new DSAPublicKey(g, privKey);
-               MessageDigest md = SHA256.getMessageDigest();
-               md.update(pubKey.asBytes());
-               byte[] pkHash = md.digest();
-               SHA256.returnMessageDigest(md);
+               byte[] pkHash = pubKey.asBytesHash();
                return new InsertableClientSSK(uri.getDocName(), pkHash, 
pubKey, privKey, uri.getCryptoKey(), keyType);
        }