[Thaw-dev] r12739 - trunk/apps/Thaw/src/thaw/fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-14 23:14:34 +0000 (Sat, 14 Apr 2007)
New Revision: 12739

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
   trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
Log:
Trying to fix SHA256Computer again

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-04-14 23:07:18 UTC 
(rev 12738)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-04-14 23:14:34 UTC 
(rev 12739)
@@ -207,7 +207,7 @@
                        status = "Computing hash to get approval from the node 
...";

                        sha = new 
SHA256Computer(queueManager.getQueryManager().getConnection().getClientHello().getConnectionId()
-                                                +"-"+ (localFile != null ? 
localFile.getPath() : "")
+                                                +"-"+ (localFile != null ? 
localFile.getPath() : "") /* Client token */
                                                 +"-",
                                                 localFile.getPath());
                        sha.addObserver(this);

Modified: trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-04-14 23:07:18 UTC 
(rev 12738)
+++ trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-04-14 23:14:34 UTC 
(rev 12739)
@@ -19,6 +19,7 @@
  */
 public class SHA256Computer extends Observable implements Runnable {
        private SHA256 sha;
+       private MessageDigest md;

        private String file;
        private String hash;
@@ -31,9 +32,10 @@
                sha = new SHA256();

                try {
-                       sha.update(header.getBytes("UTF-8"));
+                       md = sha.getMessageDigest();
+                       md.update(header.getBytes("UTF-8"));
                } catch(java.io.UnsupportedEncodingException e) {
-                       sha.update(header.getBytes());
+                       md.update(header.getBytes());
                }
        }

@@ -42,8 +44,6 @@
                try {
                        FileInputStream in = new FileInputStream(file);

-                       MessageDigest md = sha.getMessageDigest();
-
                        SHA256.hash(in, md);

                        hash = Base64.encode(md.digest());