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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-14 23:01:13 +0000 (Sat, 14 Apr 2007)
New Revision: 12736

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java
   trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
Log:
Fix my Java

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java        2007-04-14 22:55:31 UTC 
(rev 12735)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPTestDDA.java        2007-04-14 23:01:13 UTC 
(rev 12736)
@@ -88,8 +88,7 @@

                        data = "";

-                       while(stream.available() > 0) {
-                               stream.read(raw);
+                       while(stream.read(raw) >= 0) {
                                data += new String(raw);
                        }


Modified: trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-04-14 22:55:31 UTC 
(rev 12735)
+++ trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-04-14 23:01:13 UTC 
(rev 12736)
@@ -5,6 +5,8 @@

 import java.io.FileInputStream;

+import java.security.MessageDigest;
+
 import freenet.crypt.SHA256;
 import freenet.support.Base64;

@@ -28,7 +30,11 @@

                sha = new SHA256();

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


@@ -36,10 +42,14 @@
                try {
                        FileInputStream in = new FileInputStream(file);

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

-                       hash = Base64.encore(sha.digest());
+                       SHA256.hash(in, md);

+                       hash = Base64.encode(md.digest());
+
+                       SHA256.returnMessageDigest(md);
+
                } catch(java.io.FileNotFoundException e) {
                        Logger.error(this, "Can't hash file because: 
"+e.toString());
                } catch(java.io.IOException e) {