ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复SecureUtil类中HMAC算法加密器创建方法传入的key参数为空时抛异常问题

Browse Source
This commit is contained in:
高龙 2022-08-08 19:47:32 +08:00
parent 5a91443e36
commit a55a0be539
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java
View File

@ -3,7 +3,9 @@ package cn.hutool.crypto;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.HexUtil; import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm; import cn.hutool.crypto.asymmetric.AsymmetricAlgorithm;
import cn.hutool.crypto.asymmetric.RSA; import cn.hutool.crypto.asymmetric.RSA;
@ -633,7 +635,7 @@ public class SecureUtil {
* @since 3.3.0 * @since 3.3.0
*/ */
public static HMac hmac(HmacAlgorithm algorithm, String key) { public static HMac hmac(HmacAlgorithm algorithm, String key) {
return new HMac(algorithm, StrUtil.utf8Bytes(key)); return hmac(algorithm, StrUtil.isNotEmpty(key)? StrUtil.utf8Bytes(key): null);
} }
/** /**
@ -645,6 +647,9 @@ public class SecureUtil {
* @since 3.0.3 * @since 3.0.3
*/ */
public static HMac hmac(HmacAlgorithm algorithm, byte[] key) { public static HMac hmac(HmacAlgorithm algorithm, byte[] key) {
if (ArrayUtil.isEmpty(key)) {
key = generateKey(algorithm.getValue()).getEncoded();
}
return new HMac(algorithm, key); return new HMac(algorithm, key);
} }
@ -657,6 +662,9 @@ public class SecureUtil {
* @since 3.0.3 * @since 3.0.3
*/ */
public static HMac hmac(HmacAlgorithm algorithm, SecretKey key) { public static HMac hmac(HmacAlgorithm algorithm, SecretKey key) {
if (ObjectUtil.isNull(key)) {
key = generateKey(algorithm.getValue());
}
return new HMac(algorithm, key); return new HMac(algorithm, key);
} }
@ -671,7 +679,7 @@ public class SecureUtil {
* @since 3.3.0 * @since 3.3.0
*/ */
public static HMac hmacMd5(String key) { public static HMac hmacMd5(String key) {
return hmacMd5(StrUtil.utf8Bytes(key)); return hmacMd5(StrUtil.isNotEmpty(key)? StrUtil.utf8Bytes(key): null);
} }
/** /**
@ -684,6 +692,9 @@ public class SecureUtil {
* @return {@link HMac} * @return {@link HMac}
*/ */
public static HMac hmacMd5(byte[] key) { public static HMac hmacMd5(byte[] key) {
if (ArrayUtil.isEmpty(key)) {
key = generateKey(HmacAlgorithm.HmacMD5.getValue()).getEncoded();
}
return new HMac(HmacAlgorithm.HmacMD5, key); return new HMac(HmacAlgorithm.HmacMD5, key);
} }
@ -710,7 +721,7 @@ public class SecureUtil {
* @since 3.3.0 * @since 3.3.0
*/ */
public static HMac hmacSha1(String key) { public static HMac hmacSha1(String key) {
return hmacSha1(StrUtil.utf8Bytes(key)); return hmacSha1(StrUtil.isNotEmpty(key)? StrUtil.utf8Bytes(key): null);
} }
/** /**
@ -723,6 +734,9 @@ public class SecureUtil {
* @return {@link HMac} * @return {@link HMac}
*/ */
public static HMac hmacSha1(byte[] key) { public static HMac hmacSha1(byte[] key) {
if (ArrayUtil.isEmpty(key)) {
key = generateKey(HmacAlgorithm.HmacMD5.getValue()).getEncoded();
}
return new HMac(HmacAlgorithm.HmacSHA1, key); return new HMac(HmacAlgorithm.HmacSHA1, key);
} }
@ -749,7 +763,7 @@ public class SecureUtil {
* @since 5.6.0 * @since 5.6.0
*/ */
public static HMac hmacSha256(String key) { public static HMac hmacSha256(String key) {
return hmacSha256(StrUtil.utf8Bytes(key)); return hmacSha256(StrUtil.isNotEmpty(key)? StrUtil.utf8Bytes(key): null);
} }
/** /**
@ -763,6 +777,9 @@ public class SecureUtil {
* @since 5.6.0 * @since 5.6.0
*/ */
public static HMac hmacSha256(byte[] key) { public static HMac hmacSha256(byte[] key) {
if (ArrayUtil.isEmpty(key)) {
key = generateKey(HmacAlgorithm.HmacMD5.getValue()).getEncoded();
}
return new HMac(HmacAlgorithm.HmacSHA256, key); return new HMac(HmacAlgorithm.HmacSHA256, key);
} }