[freenet-cvs] r7895 - in trunk/freenet/src/freenet: keys node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-21 17:06:12 +0000 (Sat, 21 Jan 2006)
New Revision: 7895

Modified:
   trunk/freenet/src/freenet/keys/NodeSSK.java
   trunk/freenet/src/freenet/node/Version.java
Log:
368: Fix SSK setting bug.

Modified: trunk/freenet/src/freenet/keys/NodeSSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/NodeSSK.java 2006-01-21 16:41:30 UTC (rev 
7894)
+++ trunk/freenet/src/freenet/keys/NodeSSK.java 2006-01-21 17:06:12 UTC (rev 
7895)
@@ -140,7 +140,12 @@
                                }
                                byte[] newPubKeyHash = 
md256.digest(pubKey2.asBytes());
                                if(Arrays.equals(pubKeyHash, newPubKeyHash)) {
-                                       Logger.error(this, "Found SHA-256 
collision or something... WTF?");
+                                       if(pubKey != null)
+                                               Logger.error(this, "Found 
SHA-256 collision or something... WTF?");
+                                       else {
+                                               // Valid key
+                                               return;
+                                       }
                                } else {
                                        throw new SSKVerifyException("New 
pubkey has invalid hash");
                                }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-21 16:41:30 UTC (rev 
7894)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-21 17:06:12 UTC (rev 
7895)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 367;
+       public static final int buildNumber = 368;

        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 359;