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

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-05-04 09:42:08 +0000 (Sun, 04 May 2008)
New Revision: 19723

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


Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2008-05-04 09:33:35 UTC 
(rev 19722)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2008-05-04 09:42:08 UTC 
(rev 19723)
@@ -228,25 +228,27 @@
                        MessageDigest md = SHA256.getMessageDigest();
                        byte[] foundHash;
                        try {
-                       try {
-                               md.update(salt.getBytes("UTF-8"));
-                       } catch (UnsupportedEncodingException e) {}
-                       try {
-                               InputStream is = data.getInputStream();
-                               SHA256.hash(is, md);
-                               is.close();
-                       } catch (IOException e) {
-                               SHA256.returnMessageDigest(md);
-                               Logger.error(this, "Got IOE: " +e.getMessage(), 
e);
-                               throw new 
MessageInvalidException(ProtocolErrorMessage.COULD_NOT_READ_FILE, "Unable to 
access file: "+e, identifier, global);
-                       }
-                       foundHash = md.digest();
+                               try {
+                                       md.update(salt.getBytes("UTF-8"));
+                               } catch (UnsupportedEncodingException e) {
+                               }
+                               try {
+                                       InputStream is = data.getInputStream();
+                                       SHA256.hash(is, md);
+                                       is.close();
+                               } catch (IOException e) {
+                                       SHA256.returnMessageDigest(md);
+                                       Logger.error(this, "Got IOE: " + 
e.getMessage(), e);
+                                       throw new 
MessageInvalidException(ProtocolErrorMessage.COULD_NOT_READ_FILE,
+                                               "Unable to access file: " + e, 
identifier, global);
+                               }
+                               foundHash = md.digest();
                        } finally {
                                SHA256.returnMessageDigest(md);
                        }
-                       
+
                        if(logMINOR) Logger.minor(this, "FileHash result : we 
found " + Base64.encode(foundHash) + " and were given " + 
Base64.encode(saltedHash) + '.');
-                       
+
                        if(!Arrays.equals(saltedHash, foundHash))
                                throw new 
MessageInvalidException(ProtocolErrorMessage.DIRECT_DISK_ACCESS_DENIED, "The 
hash doesn't match! (salt used : \""+salt+"\")", identifier, global);
                }