[freenet-cvs] r7900 - in trunk/freenet/src/freenet: io/comm keys node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-23 19:52:30 +0000 (Mon, 23 Jan 2006)
New Revision: 7900

Modified:
   trunk/freenet/src/freenet/io/comm/DMT.java
   trunk/freenet/src/freenet/keys/NodeSSK.java
   trunk/freenet/src/freenet/node/SSKInsertHandler.java
   trunk/freenet/src/freenet/node/SSKInsertSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
372: (mandatory)
Fix SSK insert problems.

Modified: trunk/freenet/src/freenet/io/comm/DMT.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/DMT.java  2006-01-23 14:26:08 UTC (rev 
7899)
+++ trunk/freenet/src/freenet/io/comm/DMT.java  2006-01-23 19:52:30 UTC (rev 
7900)
@@ -688,6 +688,8 @@
             return "Verify failed";
         else if(reason == DATA_INSERT_REJECTED_RECEIVE_FAILED)
             return "Receive failed";
+        else if(reason == DATA_INSERT_REJECTED_SSK_ERROR)
+               return "SSK error";
         return "Unknown reason code: "+reason;
     }


Modified: trunk/freenet/src/freenet/keys/NodeSSK.java
===================================================================
--- trunk/freenet/src/freenet/keys/NodeSSK.java 2006-01-23 14:26:08 UTC (rev 
7899)
+++ trunk/freenet/src/freenet/keys/NodeSSK.java 2006-01-23 19:52:30 UTC (rev 
7900)
@@ -143,8 +143,7 @@
                                        if(pubKey != null)
                                                Logger.error(this, "Found 
SHA-256 collision or something... WTF?");
                                        else {
-                                               // Valid key
-                                               return;
+                                               // Valid key, assign.
                                        }
                                } else {
                                        throw new SSKVerifyException("New 
pubkey has invalid hash");

Modified: trunk/freenet/src/freenet/node/SSKInsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertHandler.java        2006-01-23 
14:26:08 UTC (rev 7899)
+++ trunk/freenet/src/freenet/node/SSKInsertHandler.java        2006-01-23 
19:52:30 UTC (rev 7900)
@@ -105,7 +105,7 @@
                                byte[] pubkeyAsBytes = 
((ShortBuffer)pk.getObject(DMT.PUBKEY_AS_BYTES)).getData();
                                try {
                                        pubKey = new 
DSAPublicKey(pubkeyAsBytes);
-                                       Logger.minor(this, "Got pubkey on 
"+uid);
+                                       Logger.minor(this, "Got pubkey on 
"+uid+" : "+pubKey);
                                        Message confirm = 
DMT.createFNPSSKPubKeyAccepted(uid);
                                        try {
                                                source.sendAsync(confirm, null);

Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2006-01-23 14:26:08 UTC 
(rev 7899)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2006-01-23 19:52:30 UTC 
(rev 7900)
@@ -11,7 +11,6 @@
 import freenet.io.comm.Message;
 import freenet.io.comm.MessageFilter;
 import freenet.io.comm.NotConnectedException;
-import freenet.keys.CHKBlock;
 import freenet.keys.NodeSSK;
 import freenet.keys.SSKBlock;
 import freenet.keys.SSKVerifyException;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-23 14:26:08 UTC (rev 
7899)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-23 19:52:30 UTC (rev 
7900)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

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

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 369;
+       public static final int lastGoodBuild = 372;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;