mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-05-09 23:51:34 +08:00
fix code
This commit is contained in:
parent
31407e11a0
commit
f013446279
@ -8,6 +8,9 @@ import java.security.Provider;
|
||||
* @author looly
|
||||
*/
|
||||
public enum GlobalBouncyCastleProvider {
|
||||
/**
|
||||
* 单例对象
|
||||
*/
|
||||
INSTANCE;
|
||||
|
||||
private Provider provider;
|
||||
|
@ -745,9 +745,8 @@ public class KeyUtil {
|
||||
* @return {@link KeyStore}
|
||||
*/
|
||||
public static KeyStore readKeyStore(final String type, final InputStream in, final char[] password) {
|
||||
final KeyStore keyStore;
|
||||
final KeyStore keyStore = getKeyStore(type);
|
||||
try {
|
||||
keyStore = KeyStore.getInstance(type);
|
||||
keyStore.load(in, password);
|
||||
} catch (final 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中获取私钥公钥
|
||||
*
|
||||
@ -993,6 +1007,7 @@ public class KeyUtil {
|
||||
|
||||
/**
|
||||
* 将密钥编码为Base64格式
|
||||
*
|
||||
* @param key 密钥
|
||||
* @return Base64格式密钥
|
||||
* @since 5.7.22
|
||||
|
Loading…
x
Reference in New Issue
Block a user