Revert to constants

sebbASF · sebbASF · commit 858aa75ed257 · 2016-05-16T23:55:14.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1744171 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java b/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
@@ -102,7 +102,7 @@ public static String sha256Crypt(final byte[] keyBytes, String salt) {
         if (salt == null) {
             salt = SHA256_PREFIX + B64.getRandomSalt(8);
         }
-        return sha2Crypt(keyBytes, salt, SHA256_PREFIX, SHA256_BLOCKSIZE, MessageDigestAlgorithm.SHA_256.getName());
+        return sha2Crypt(keyBytes, salt, SHA256_PREFIX, SHA256_BLOCKSIZE, MessageDigestAlgorithms.SHA_256);
     }
 
     /**
@@ -540,6 +540,6 @@ public static String sha512Crypt(final byte[] keyBytes, String salt) {
         if (salt == null) {
             salt = SHA512_PREFIX + B64.getRandomSalt(8);
         }
-        return sha2Crypt(keyBytes, salt, SHA512_PREFIX, SHA512_BLOCKSIZE, MessageDigestAlgorithm.SHA_512.getName());
+        return sha2Crypt(keyBytes, salt, SHA512_PREFIX, SHA512_BLOCKSIZE, MessageDigestAlgorithms.SHA_512);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public static String sha256Crypt(final byte[] keyBytes, String salt) {`
`102`	`102`	`if (salt == null) {`
`103`	`103`	`salt = SHA256_PREFIX + B64.getRandomSalt(8);`
`104`	`104`	`}`
`105`		`- return sha2Crypt(keyBytes, salt, SHA256_PREFIX, SHA256_BLOCKSIZE, MessageDigestAlgorithm.SHA_256.getName());`
	`105`	`+ return sha2Crypt(keyBytes, salt, SHA256_PREFIX, SHA256_BLOCKSIZE, MessageDigestAlgorithms.SHA_256);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`/**`
`@@ -540,6 +540,6 @@ public static String sha512Crypt(final byte[] keyBytes, String salt) {`
`540`	`540`	`if (salt == null) {`
`541`	`541`	`salt = SHA512_PREFIX + B64.getRandomSalt(8);`
`542`	`542`	`}`
`543`		`- return sha2Crypt(keyBytes, salt, SHA512_PREFIX, SHA512_BLOCKSIZE, MessageDigestAlgorithm.SHA_512.getName());`
	`543`	`+ return sha2Crypt(keyBytes, salt, SHA512_PREFIX, SHA512_BLOCKSIZE, MessageDigestAlgorithms.SHA_512);`
`544`	`544`	`}`
`545`	`545`	`}`