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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-14 22:55:31 +0000 (Sat, 14 Apr 2007)
New Revision: 12735

Modified:
   trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
Log:
Fix SHA256Computer according to the recommandations of nextgens

Modified: trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-04-14 22:43:08 UTC 
(rev 12734)
+++ trunk/apps/Thaw/src/thaw/fcp/SHA256Computer.java    2007-04-14 22:55:31 UTC 
(rev 12735)
@@ -19,6 +19,7 @@
        private SHA256 sha;

        private String file;
+       private String hash;

        public final static int BLOCK_SIZE = 32768; /* 32 Ko */

@@ -27,7 +28,7 @@

                sha = new SHA256();

-               sha.update(header.getBytes());
+               sha.update(header.getBytes("UTF-8"));
        }


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

-                       byte[] raw = new byte[BLOCK_SIZE];
+                       SHA256.hash(in, sha);

-                       while(in.available() > 0) {
-                               if (in.available() < BLOCK_SIZE)
-                                       raw = new byte[in.available()];
+                       hash = Base64.encore(sha.digest());

-                               in.read(raw);
-                               sha.update(raw);
-                       }
-
-                       in.close();
                } catch(java.io.FileNotFoundException e) {
                        Logger.error(this, "Can't hash file because: 
"+e.toString());
-                       sha = null;
                } catch(java.io.IOException e) {
                        Logger.error(this, "Can't hash file because: 
"+e.toString());
-                       sha = null;
                }

                setChanged();
@@ -70,11 +62,6 @@
         * Returns the Base64Encode of the hash
         */
        public String getHash() {
-               if (sha != null)
-                       return Base64.encode(sha.digest());
-               else {
-                       Logger.warning(this, "No hash !");
-                       return null;
-               }
+               return hash;
        }
 }