[commit] modify CipherUtils

h4de5ing · h4de5ing · commit 40a7a5fad2ae · 2016-05-20T18:49:48.000+08:00
diff --git a/library/src/main/java/com/code19/library/CipherUtils.java b/library/src/main/java/com/code19/library/CipherUtils.java
@@ -18,57 +18,70 @@
 
 import android.util.Base64;
 
+import java.io.IOException;
 import java.io.InputStream;
+import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
 /**
  * Create by h4de5ing 2016/5/7 007
  */
 public class CipherUtils {
-
-    public static String md5Encode(InputStream in) {
+    /**
+     * checked
+     */
+    public static String encode(String input) {
         try {
-            MessageDigest digester = MessageDigest.getInstance("MD5");
-            byte[] bytes = new byte[8192];
-            int byteCount;
-            while ((byteCount = in.read(bytes)) > 0) {
-                digester.update(bytes, 0, byteCount);
-            }
-            byte[] digest = digester.digest();
-            StringBuilder sb = new StringBuilder();
-            for (byte b : digest) {
-                int r = b & 0xff;
-                String hex = Integer.toHexString(r);
-                if (hex.length() == 1) {
-                    hex = 0 + hex;
-                }
-                sb.append(hex);
+            MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+            byte[] inputByteArray = input.getBytes();
+            messageDigest.update(inputByteArray);
+            byte[] resultByteArray = messageDigest.digest();
+            char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+            char[] resultCharArray = new char[resultByteArray.length * 2];
+            int index = 0;
+            for (byte b : resultByteArray) {
+                resultCharArray[index++] = hexDigits[b >>> 4 & 0xf];
+                resultCharArray[index++] = hexDigits[b & 0xf];
             }
-            return sb.toString();
-        } catch (Exception e) {
-            e.printStackTrace();
+            return new String(resultCharArray);
+        } catch (NoSuchAlgorithmException e) {
+            return null;
         }
-        return null;
     }
 
-
-    public static String md5Encode(String pwd) {
+    /**
+     * checked
+     */
+    public static String md5Encode(InputStream in) {
+        int bufferSize = 256 * 1024;
+        DigestInputStream digestInputStream = null;
         try {
-            MessageDigest instance = MessageDigest.getInstance("md5");
-            byte[] digest = instance.digest(pwd.getBytes());
-            StringBuilder sb = new StringBuilder();
-            for (byte b : digest) {
-                int r = b & 0xff;
-                String hex = Integer.toHexString(r);
-                if (hex.length() == 1) {
-                    hex = 0 + hex;
-                }
-                sb.append(r);
+            MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+            digestInputStream = new DigestInputStream(in, messageDigest);
+            byte[] buffer = new byte[bufferSize];
+            while (digestInputStream.read(buffer) > 0) ;
+            messageDigest = digestInputStream.getMessageDigest();
+            byte[] resultByteArray = messageDigest.digest();
+            char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+            char[] resultCharArray = new char[resultByteArray.length * 2];
+            int index = 0;
+            for (byte b : resultByteArray) {
+                resultCharArray[index++] = hexDigits[b >>> 4 & 0xf];
+                resultCharArray[index++] = hexDigits[b & 0xf];
             }
-            return sb.toString();
+            return new String(resultCharArray);
         } catch (NoSuchAlgorithmException e) {
+            return null;
+        } catch (IOException e) {
             e.printStackTrace();
+        } finally {
+            try {
+                if (digestInputStream != null)
+                    digestInputStream.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         return null;
     }
