[JENKINS-16301] Replace impl of getDigestOf with standard (Commons Co…

…dec) DigestUtils.md5Hex, for simplicity.
jenkinsci · May 21, 2013 · 51fbd2d · 51fbd2d · jglick · Jun 14, 2013
1 parent b5d96e2
commit 51fbd2d
Showing 1 changed file with 3 additions and 19 deletions.
diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java
@@ -30,11 +30,9 @@
 import hudson.Proc.LocalProc;
 import hudson.model.TaskListener;
 import hudson.os.PosixAPI;
-import hudson.util.IOException2;
 import hudson.util.QuotedStringTokenizer;
 import hudson.util.VariableResolver;
 import hudson.util.jna.WinIOException;
-import jenkins.model.Jenkins;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.time.FastDateFormat;
 import org.apache.tools.ant.BuildException;
@@ -45,7 +43,6 @@
 import org.jruby.ext.posix.FileStat;
 import org.jruby.ext.posix.POSIX;
 import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
-import org.kohsuke.stapler.Stapler;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
@@ -61,7 +58,6 @@
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
-import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.NumberFormat;
@@ -76,6 +72,7 @@
 import hudson.util.jna.Kernel32Utils;
 
 import static hudson.util.jna.GNUCLibrary.LIBC;
+import org.apache.commons.codec.digest.DigestUtils;
 
 /**
  * Various utility methods that don't have more proper home.
@@ -554,23 +551,10 @@ public static String ensureEndsWith(String subject, String suffix) {
      *      The stream will be closed by this method at the end of this method.
      * @return
      *      32-char wide string
+     * @see DigestUtils#md5(InputStream)
      */
     public static String getDigestOf(InputStream source) throws IOException {
-        try {
-            MessageDigest md5 = MessageDigest.getInstance("MD5");
-
-            byte[] buffer = new byte[1024];
-            DigestInputStream in =new DigestInputStream(source,md5);
-            try {
-                while(in.read(buffer)>=0)
-                    ; // simply discard the input
-            } finally {
-                in.close();
-            }
-            return toHexString(md5.digest());
-        } catch (NoSuchAlgorithmException e) {
-            throw new IOException2("MD5 not installed",e);    // impossible
-        }
+        return DigestUtils.md5Hex(source);
     }
 
     public static String getDigestOf(String text) {