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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-04-15 13:14:13 +0000 (Sun, 15 Apr 2007)
New Revision: 12745

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
Log:
Fix FileHash

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-15 12:43:58 UTC 
(rev 12744)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2007-04-15 13:14:13 UTC 
(rev 12745)
@@ -25,6 +25,7 @@
 import freenet.support.Logger;
 import freenet.support.SimpleFieldSet;
 import freenet.support.SimpleReadOnlyArrayBucket;
+import freenet.support.Fields.ByteArrayComparator;
 import freenet.support.api.Bucket;
 import freenet.support.io.CannotCreateFromFieldSetException;
 import freenet.support.io.FileBucket;
@@ -229,7 +230,9 @@
                        final byte[] foundHash = md.digest();
                        SHA256.returnMessageDigest(md);

-                       if(!foundHash.equals(saltedHash))
+                       if(logMINOR) Logger.minor(this, "FileHash result : we 
found " + Base64.encode(foundHash) + " and were given " + 
Base64.encode(saltedHash) + '.');
+                       
+                       if(ByteArrayComparator.compare(saltedHash, foundHash) 
!= 0)
                                throw new 
MessageInvalidException(ProtocolErrorMessage.DIRECT_DISK_ACCESS_DENIED, "The 
hash doesn't match! (salt used : \""+salt+"\")", identifier, global);
                }