You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/05/22 22:53:44 UTC
svn commit: r1745098 -
/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
Author: sebb
Date: Sun May 22 22:53:44 2016
New Revision: 1745098
URL: http://svn.apache.org/viewvc?rev=1745098&view=rev
Log:
Use local code rather than depending on the enum methods
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/HmacUtils.java
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=1745098&r1=1745097&r2=1745098&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 Sun May 22 22:53:44 2016
@@ -228,7 +228,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacMd5(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_MD5.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_MD5, key).hmac(valueToDigest);
}
/**
@@ -250,7 +250,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacMd5(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_MD5.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_MD5, key).hmac(valueToDigest);
}
/**
@@ -267,7 +267,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacMd5(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_MD5.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_MD5, key).hmac(valueToDigest);
}
/**
@@ -284,7 +284,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacMd5Hex(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_MD5.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_MD5, key).hmacHex(valueToDigest);
}
/**
@@ -306,7 +306,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacMd5Hex(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_MD5.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_MD5, key).hmacHex(valueToDigest);
}
/**
@@ -323,7 +323,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacMd5Hex(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_MD5.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_MD5, key).hmacHex(valueToDigest);
}
// hmacSha1
@@ -342,7 +342,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha1(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_1.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_1, key).hmac(valueToDigest);
}
/**
@@ -364,7 +364,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha1(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_SHA_1.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_1, key).hmac(valueToDigest);
}
/**
@@ -381,7 +381,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha1(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_1.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_1, key).hmac(valueToDigest);
}
/**
@@ -398,7 +398,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha1Hex(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_1.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_1, key).hmacHex(valueToDigest);
}
/**
@@ -420,7 +420,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha1Hex(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_SHA_1.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_1, key).hmacHex(valueToDigest);
}
/**
@@ -437,7 +437,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha1Hex(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_1.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_1, key).hmacHex(valueToDigest);
}
// hmacSha256
@@ -456,7 +456,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha256(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_256.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_256, key).hmac(valueToDigest);
}
/**
@@ -478,7 +478,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha256(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_SHA_256.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_256, key).hmac(valueToDigest);
}
/**
@@ -495,7 +495,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha256(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_256.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_256, key).hmac(valueToDigest);
}
/**
@@ -512,7 +512,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha256Hex(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_256.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_256, key).hmacHex(valueToDigest);
}
/**
@@ -534,7 +534,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha256Hex(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_SHA_256.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_256, key).hmacHex(valueToDigest);
}
/**
@@ -551,7 +551,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha256Hex(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_256.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_256, key).hmacHex(valueToDigest);
}
// hmacSha384
@@ -570,7 +570,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha384(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_384.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_384, key).hmac(valueToDigest);
}
/**
@@ -592,7 +592,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha384(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_SHA_384.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_384, key).hmac(valueToDigest);
}
/**
@@ -609,7 +609,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha384(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_384.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_384, key).hmac(valueToDigest);
}
/**
@@ -626,7 +626,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha384Hex(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_384.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_384, key).hmacHex(valueToDigest);
}
/**
@@ -648,7 +648,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha384Hex(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_SHA_384.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_384, key).hmacHex(valueToDigest);
}
/**
@@ -665,7 +665,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha384Hex(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_384.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_384, key).hmacHex(valueToDigest);
}
// hmacSha512
@@ -684,7 +684,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha512(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_512.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_512, key).hmac(valueToDigest);
}
/**
@@ -706,7 +706,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha512(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_SHA_512.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_512, key).hmac(valueToDigest);
}
/**
@@ -723,7 +723,7 @@ public final class HmacUtils {
*/
@Deprecated
public static byte[] hmacSha512(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_512.hmac(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_512, key).hmac(valueToDigest);
}
/**
@@ -740,7 +740,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha512Hex(final byte[] key, final byte[] valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_512.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_512, key).hmacHex(valueToDigest);
}
/**
@@ -762,7 +762,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha512Hex(final byte[] key, final InputStream valueToDigest) throws IOException {
- return HmacAlgorithms.HMAC_SHA_512.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_512, key).hmacHex(valueToDigest);
}
/**
@@ -779,7 +779,7 @@ public final class HmacUtils {
*/
@Deprecated
public static String hmacSha512Hex(final String key, final String valueToDigest) {
- return HmacAlgorithms.HMAC_SHA_512.hmacHex(key, valueToDigest);
+ return HmacUtils.use(HmacAlgorithms.HMAC_SHA_512, key).hmacHex(valueToDigest);
}
// update
@@ -885,6 +885,34 @@ public final class HmacUtils {
}
/**
+ * Creates an instance using the provided algorithm type.
+ *
+ * @param algorithm to be used
+ * @param key the key to be used
+ * @return the instance
+ * @throws IllegalArgumentException
+ * when a {@link NoSuchAlgorithmException} is caught or key is null or key is invalid.
+ * @since 1.11
+ */
+ public static HmacUtils use(final String algorithm, final String key) {
+ return new HmacUtils(algorithm, StringUtils.getBytesUtf8(key));
+ }
+
+ /**
+ * Creates an instance using the provided algorithm type.
+ *
+ * @param algorithm to be used
+ * @param key the key to be used
+ * @return the instance
+ * @throws IllegalArgumentException
+ * when a {@link NoSuchAlgorithmException} is caught or key is null or key is invalid.
+ * @since 1.11
+ */
+ public static HmacUtils use(final HmacAlgorithms algorithm, final String key) {
+ return new HmacUtils(algorithm.getName(), StringUtils.getBytesUtf8(key));
+ }
+
+ /**
* Creates an instance using the provided algorithm type.
*
* @param algorithm to be used.