lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

KeyUtil中的读取KeyStore文件的方法增加全局Provider

Browse Source
This commit is contained in:
Looly 2022-12-27 19:52:33 +08:00
parent b78657f67f
commit 05c32a8f46
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@
* 【core 】 HtmlUtil中escape方法，增加不断开空格（nbsp）转译，防止xss攻击（pr#2755@Github）
* 【extra 】 修正sftp.cd方法 方法注释和实际效果不符（issue#2758@Github）
* 【core 】 修改PhoneUtil容易歧义的注释（issue#I63GWK@Gitee）
* 【crypto】 KeyUtil中的读取KeyStore文件的方法增加全局Provider（issue#I6796G@Gitee）
*
### 🐞Bug修复
* 【json 】 修复普通byte数组转JSONArray时的异常（pr#875@Gitee）

43
hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java
View File

@ -127,7 +127,7 @@ public class KeyUtil {
*
* @param algorithm 算法，支持PBE算法
* @param keySize 密钥长度，<0表示不设定密钥长度，即使用默认长度
* @param random 随机数生成器，null表示默认
* @param random 随机数生成器，null表示默认
* @return {@link SecretKey}
* @since 5.5.2
*/
@ -140,7 +140,7 @@ public class KeyUtil {
keySize = 128;
}
if(keySize > 0){
if (keySize > 0) {
if (null == random) {
keyGenerator.init(keySize);
} else {
@ -365,7 +365,7 @@ public class KeyUtil {
*/
public static KeyPair generateKeyPair(String algorithm) {
int keySize = DEFAULT_KEY_SIZE;
if("ECIES".equalsIgnoreCase(algorithm)){
if ("ECIES".equalsIgnoreCase(algorithm)) {
// ECIES算法对KEY的长度有要求，此处默认256
keySize = 256;
}
@ -643,7 +643,7 @@ public class KeyUtil {
public static String getAlgorithmAfterWith(String algorithm) {
Assert.notNull(algorithm, "algorithm must be not null !");
if(StrUtil.startWithIgnoreCase(algorithm, "ECIESWith")){
if (StrUtil.startWithIgnoreCase(algorithm, "ECIESWith")) {
return "EC";
}
@ -745,9 +745,8 @@ public class KeyUtil {
* @return {@link KeyStore}
*/
public static KeyStore readKeyStore(String type, InputStream in, char[] password) {
KeyStore keyStore;
final KeyStore keyStore = getKeyStore(type);
try {
keyStore = KeyStore.getInstance(type);
keyStore.load(in, password);
} catch (Exception e) {
throw new CryptoException(e);
@ -755,6 +754,21 @@ public class KeyUtil {
return keyStore;
}
/**
* 获取{@link KeyStore}对象
*
* @param type 类型
* @return {@link KeyStore}
*/
public static KeyStore getKeyStore(final String type) {
final Provider provider = GlobalBouncyCastleProvider.INSTANCE.getProvider();
try {
return null == provider ? KeyStore.getInstance(type) : KeyStore.getInstance(type, provider);
} catch (final KeyStoreException e) {
throw new CryptoException(e);
}
}
/**
* 从KeyStore中获取私钥公钥
*
@ -953,9 +967,9 @@ public class KeyUtil {
* @return RSA公钥，null表示私钥不被支持
* @since 5.3.6
*/
public static PublicKey getRSAPublicKey(PrivateKey privateKey){
if(privateKey instanceof RSAPrivateCrtKey){
final RSAPrivateCrtKey privk = (RSAPrivateCrtKey)privateKey;
public static PublicKey getRSAPublicKey(PrivateKey privateKey) {
if (privateKey instanceof RSAPrivateCrtKey) {
final RSAPrivateCrtKey privk = (RSAPrivateCrtKey) privateKey;
return getRSAPublicKey(privk.getModulus(), privk.getPublicExponent());
}
return null;
@ -964,12 +978,12 @@ public class KeyUtil {
/**
* 获得RSA公钥对象
*
* @param modulus Modulus
* @param modulus Modulus
* @param publicExponent Public Exponent
* @return 公钥
* @since 5.3.6
*/
public static PublicKey getRSAPublicKey(String modulus, String publicExponent){
public static PublicKey getRSAPublicKey(String modulus, String publicExponent) {
return getRSAPublicKey(
new BigInteger(modulus, 16), new BigInteger(publicExponent, 16));
}
@ -977,12 +991,12 @@ public class KeyUtil {
/**
* 获得RSA公钥对象
*
* @param modulus Modulus
* @param modulus Modulus
* @param publicExponent Public Exponent
* @return 公钥
* @since 5.3.6
*/
public static PublicKey getRSAPublicKey(BigInteger modulus, BigInteger publicExponent){
public static PublicKey getRSAPublicKey(BigInteger modulus, BigInteger publicExponent) {
final RSAPublicKeySpec publicKeySpec = new RSAPublicKeySpec(modulus, publicExponent);
try {
return getKeyFactory("RSA").generatePublic(publicKeySpec);
@ -993,11 +1007,12 @@ public class KeyUtil {
/**
* 将密钥编码为Base64格式
*
* @param key 密钥
* @return Base64格式密钥
* @since 5.7.22
*/
public static String toBase64(Key key){
public static String toBase64(Key key) {
return Base64.encode(key.getEncoded());
}
}