Author: sebb
Date: Wed May 18 10:41:50 2016
New Revision: 1744385
URL: http://svn.apache.org/viewvc?rev=1744385&view=rev
Log:
MessageDigestAlgorithm => MessageDigestAlgorithms as the former has been dropped
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java?rev=1744385&r1=1744384&r2=1744385&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Digest.java
Wed May 18 10:41:50 2016
@@ -40,7 +40,7 @@ public class Digest {
* </p>
*
* @param args
- * {@code args[0]} is one of {@link MessageDigestAlgorithm}
name, {@link MessageDigest} name, {@code ALL}
+ * {@code args[0]} is one of {@link MessageDigestAlgorithms}
name, {@link MessageDigest} name, {@code ALL}
* , or {@code *}. {@code args[1]} is a FILE.
* @throws IOException
*/
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java?rev=1744385&r1=1744384&r2=1744385&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/DigestUtils.java
Wed May 18 10:41:50 2016
@@ -161,7 +161,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which
should never happen because MD2 is a
* built-in algorithm
- * @see MessageDigestAlgorithm#MD2
+ * @see MessageDigestAlgorithms#MD2
* @since 1.7
*/
public static MessageDigest getMd2Digest() {
@@ -175,7 +175,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which
should never happen because MD5 is a
* built-in algorithm
- * @see MessageDigestAlgorithm#MD5
+ * @see MessageDigestAlgorithms#MD5
*/
public static MessageDigest getMd5Digest() {
return getDigest(MessageDigestAlgorithms.MD5);
@@ -188,7 +188,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which
should never happen because SHA-1 is a
* built-in algorithm
- * @see MessageDigestAlgorithm#SHA_1
+ * @see MessageDigestAlgorithms#SHA_1
* @since 1.7
*/
public static MessageDigest getSha1Digest() {
@@ -205,7 +205,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught on Java 7
and older, SHA-224 is a built-in
* algorithm on Java 8
- * @see MessageDigestAlgorithm#SHA_224
+ * @see MessageDigestAlgorithms#SHA_224
* @since 1.11
*/
public static MessageDigest getSha224Digest() {
@@ -222,7 +222,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which
should never happen because SHA-256 is a
* built-in algorithm
- * @see MessageDigestAlgorithm#SHA_256
+ * @see MessageDigestAlgorithms#SHA_256
*/
public static MessageDigest getSha256Digest() {
return getDigest(MessageDigestAlgorithms.SHA_256);
@@ -238,7 +238,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which
should never happen because SHA-384 is a
* built-in algorithm
- * @see MessageDigestAlgorithm#SHA_384
+ * @see MessageDigestAlgorithms#SHA_384
*/
public static MessageDigest getSha384Digest() {
return getDigest(MessageDigestAlgorithms.SHA_384);
@@ -254,7 +254,7 @@ public class DigestUtils {
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught, which
should never happen because SHA-512 is a
* built-in algorithm
- * @see MessageDigestAlgorithm#SHA_512
+ * @see MessageDigestAlgorithms#SHA_512
*/
public static MessageDigest getSha512Digest() {
return getDigest(MessageDigestAlgorithms.SHA_512);
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java?rev=1744385&r1=1744384&r2=1744385&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
Wed May 18 10:41:50 2016
@@ -833,4 +833,34 @@ public final class HmacUtils {
mac.update(StringUtils.getBytesUtf8(valueToDigest));
return mac;
}
+
+ // Fluent interface code
+
+ private final Mac mac;
+
+ private HmacUtils(Mac mac) {
+ this.mac = mac;
+ }
+
+ public static HmacUtils with(HmacAlgorithms algo, byte[] key) {
+ return with(algo.getName(), key);
+ }
+
+ public static HmacUtils with(String algo, byte[] key) {
+ Mac mac = getInitializedMac(algo, key);
+ return new HmacUtils(mac);
+ }
+
+ public HmacUtils updateHmac(byte[] valueToDigest) {
+ mac.update(valueToDigest);
+ return this;
+ }
+
+ public Mac getMac() {
+ return mac;
+ }
+
+ public byte[] doFinal() {
+ return mac.doFinal();
+ }
}
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java?rev=1744385&r1=1744384&r2=1744385&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
(original)
+++
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java
Wed May 18 10:41:50 2016
@@ -128,7 +128,7 @@ public class Sha2Crypt {
* if the given salt is <code>null</code> or does not match
the allowed pattern
* @throws IllegalArgumentException
* when a {@link NoSuchAlgorithmException} is caught
- * @see MessageDigestAlgorithm
+ * @see MessageDigestAlgorithms
*/
private static String sha2Crypt(final byte[] keyBytes, final String salt,
final String saltPrefix,
final int blocksize, final String algorithm) {
Modified:
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java?rev=1744385&r1=1744384&r2=1744385&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java
(original)
+++
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/digest/MessageDigestAlgorithmTest.java
Wed May 18 10:41:50 2016
@@ -32,7 +32,7 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
/**
- * Tests {@link MessageDigestAlgorithm}.
+ * Tests {@link MessageDigestAlgorithms}.
*
* @since 1.11
*/
