Author: toad
Date: 2009-01-06 20:48:30 +0000 (Tue, 06 Jan 2009)
New Revision: 24935

Modified:
   trunk/freenet/src/freenet/node/NodeCrypto.java
Log:
Don't keep the clientNonce here


Modified: trunk/freenet/src/freenet/node/NodeCrypto.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeCrypto.java      2009-01-06 20:42:58 UTC 
(rev 24934)
+++ trunk/freenet/src/freenet/node/NodeCrypto.java      2009-01-06 20:48:30 UTC 
(rev 24935)
@@ -58,8 +58,6 @@
        byte[] identityHash;
        /** Hash of hash of identity i.e. hash of setup key. */
        byte[] identityHashHash;
-       /** Nonce used to generate ?secureid= for fproxy etc */
-       byte[] clientNonce;
        /** My crypto group */
        private DSAGroup cryptoGroup;
        /** My private key */
@@ -233,18 +231,6 @@
                }
                myARK = ark;
                
-               String cn = fs.get("clientNonce");
-               if(cn != null) {
-                       try {
-                               clientNonce = Base64.decode(cn);
-                       } catch (IllegalBase64Exception e) {
-                               throw new IOException("Invalid clientNonce 
field: "+e);
-                       }
-               } else {
-                       clientNonce = new byte[32];
-                       node.random.nextBytes(clientNonce);
-               }
-               
        }
 
        /**
@@ -263,8 +249,6 @@
                myARKNumber = 0;
                SHA256.returnMessageDigest(md);
                anonSetupCipher.initialize(identityHash);
-               clientNonce = new byte[32];
-               node.random.nextBytes(clientNonce);
        }
 
        public void start(boolean disableHangchecker) {
@@ -449,7 +433,6 @@
                // We must save the location!
                if(fs.get("location") == null)
                        fs.put("location", node.lm.getLocation());
-               fs.putSingle("clientNonce", Base64.encode(clientNonce));
                
        }
 

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to