[freenet-cvs] r12769 - trunk/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2007-04-18 12:55:15 +0000 (Wed, 18 Apr 2007)
New Revision: 12769

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
Log:
FileHash should be conn identifier + '-' + req identifier (NOT CLIENT TOKEN) + 
'-' + file content

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-17 13:06:20 UTC 
(rev 12768)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-18 12:55:15 UTC 
(rev 12769)
@@ -163,7 +163,7 @@

                        if(message.fileHash != null) {
                                try {
-                                       salt = handler.connectionIdentifier + 
'-' + message.clientToken + '-';
+                                       salt = handler.connectionIdentifier + 
'-' + message.identifier + '-';
                                        saltedHash = 
Base64.decode(message.fileHash);
                                } catch (IllegalBase64Exception e) {
                                        throw new 
MessageInvalidException(ProtocolErrorMessage.INVALID_FIELD, "Can't base64 
decode " + ClientPutBase.FILE_HASH, identifier, global);