[freenet-cvs] r11100 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2006-11-29 00:44:13 +0000 (Wed, 29 Nov 2006)
New Revision: 11100

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Don't pick up DSA group/pubkey on connect any more. It should be in all 
references.
Make DSA group/pubkey final.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-11-29 00:41:44 UTC 
(rev 11099)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-11-29 00:44:13 UTC 
(rev 11100)
@@ -213,11 +213,11 @@
     /** Version of the node */
     private String version;

-    /** Peer node crypto group */
-    DSAGroup peerCryptoGroup;
+    /** Peer node crypto group; changing this means new noderef */
+    final DSAGroup peerCryptoGroup;

-    /** Peer node public key */
-    DSAPublicKey peerPubKey;
+    /** Peer node public key; changing this means new noderef */
+    final DSAPublicKey peerPubKey;

     private boolean isSignatureVerificationSuccessfull;

@@ -1666,26 +1666,6 @@
             if(!Arrays.equals(newIdentity, identity))
                 throw new FSParseException("Identity changed!!");

-            // FIXME: throw an exception if not present once everyone has 
updated but do NOT replace things
-            if(peerCryptoGroup == null){
-               SimpleFieldSet sfs = fs.subset("dsaGroup");
-               Logger.normal(this, "Picking up peerCrypto group from "+ 
(forARK ? "ark" : "DH") +" for "+Base64.encode(this.identity));
-               if(sfs == null)
-                       this.peerCryptoGroup = null;
-               else
-                       this.peerCryptoGroup = DSAGroup.create(sfs);
-            }
-
-            if(peerPubKey == null){
-               SimpleFieldSet sfs = fs.subset("dsaGroup");
-               Logger.normal(this, "Picking up dsaGroup from "+ (forARK ? 
"ark" : "DH") +" for "+Base64.encode(this.identity));
-
-               sfs = fs.subset("dsaPubKey");
-               if(sfs == null)
-                       this.peerPubKey = null;
-               else
-                       this.peerPubKey = DSAPublicKey.create(sfs, 
peerCryptoGroup);
-            }
         } catch (NumberFormatException e) {
             throw new FSParseException(e);
         } catch (IllegalBase64Exception e) {