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

[t...@freenetproject.org]

Author: toad
Date: 2007-02-13 23:04:35 +0000 (Tue, 13 Feb 2007)
New Revision: 11772

Modified:
   trunk/freenet/src/freenet/keys/FreenetURI.java
   trunk/freenet/src/freenet/keys/InsertableClientSSK.java
Log:
Remove duplicate function getKeyVal

Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java      2007-02-13 20:37:31 UTC 
(rev 11771)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java      2007-02-13 23:04:35 UTC 
(rev 11772)
@@ -400,10 +400,6 @@
                return metaStr;
        }

-       public byte[] getKeyVal() {
-               return getRoutingKey();
-       }
-
        public byte[] getRoutingKey() {
                return routingKey;
        }

Modified: trunk/freenet/src/freenet/keys/InsertableClientSSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/InsertableClientSSK.java     2007-02-13 
20:37:31 UTC (rev 11771)
+++ trunk/freenet/src/freenet/keys/InsertableClientSSK.java     2007-02-13 
23:04:35 UTC (rev 11772)
@@ -65,7 +65,7 @@
                if((uri.getDocName() == null) || (uri.getDocName().length() == 
0))
                        throw new MalformedURLException("SSK URIs must have a 
document name (to avoid ambiguity)");
                DSAGroup g = Global.DSAgroupBigA;
-               DSAPrivateKey privKey = new DSAPrivateKey(new 
NativeBigInteger(1, uri.getKeyVal()));
+               DSAPrivateKey privKey = new DSAPrivateKey(new 
NativeBigInteger(1, uri.getRoutingKey()));
                DSAPublicKey pubKey = new DSAPublicKey(g, privKey);
                MessageDigest md = SHA256.getMessageDigest();
                md.update(pubKey.asBytes());