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

add methods

Browse Source
This commit is contained in:
Looly 2022-07-17 21:52:55 +08:00
parent 700de56daa
commit faa6eebe52
1 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
hutool-crypto/src/main/java/cn/hutool/crypto/OpensslKeyUtil.java
View File

@ -3,7 +3,6 @@ package cn.hutool.crypto;
import cn.hutool.core.io.IORuntimeException;
import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.openssl.PEMDecryptorProvider;
import org.bouncycastle.openssl.PEMEncryptedKeyPair;
@ -84,23 +83,6 @@ public class OpensslKeyUtil {
}
}
/**
* 从pem文件中读取公钥或私钥<br>
* 根据类型返回 {@link PublicKey} 或者 {@link PrivateKey}
*
* @param keyStream pem 流
* @param password 私钥密码
* @return {@link Key}，null 表示无法识别的密钥类型
* @since 5.8.5
*/
public static Key readPemKey(final InputStream keyStream, final char[] password) {
try (final PEMParser pemParser = new PEMParser(new InputStreamReader(keyStream))) {
return readPemKeyFromKeyObject(pemParser.readObject(), password);
} catch (final IOException e) {
throw new CryptoException(e);
}
}
/**
* 解密{@link PKCS8EncryptedPrivateKeyInfo}为{@link PrivateKeyInfo}
*
@ -137,6 +119,40 @@ public class OpensslKeyUtil {
}
}
/**
* 从pem文件中读取公钥或私钥<br>
* 根据类型返回 {@link PublicKey} 或者 {@link PrivateKey}
*
* @param keyStream pem 流
* @param password 私钥密码
* @return {@link Key}，null 表示无法识别的密钥类型
* @since 5.8.5
*/
public static Key readPemKey(final InputStream keyStream, final char[] password) {
try (final PEMParser pemParser = new PEMParser(new InputStreamReader(keyStream))) {
return readPemKeyFromKeyObject(pemParser.readObject(), password);
} catch (final IOException e) {
throw new CryptoException(e);
}
}
/**
* 从pem文件中读取公钥或私钥<br>
* 根据类型返回 {@link PublicKey} 或者 {@link PrivateKey}
*
* @param keyStream pem 流
* @param password 私钥密码
* @return {@link Key}，null 表示无法识别的密钥类型
* @since 5.8.5
*/
public static KeyPair readPemKeyPair(final InputStream keyStream, final char[] password) {
try (final PEMParser pemParser = new PEMParser(new InputStreamReader(keyStream))) {
return readPemKeyPairFromKeyObject(pemParser.readObject(), password);
} catch (final IOException e) {
throw new CryptoException(e);
}
}
/**
* 读取Pem文件中的密钥，密钥支持包括：<br>
* <ul>
@ -184,4 +200,30 @@ public class OpensslKeyUtil {
throw new CryptoException("Unsupported key object type: {}", keyObject.getClass());
}
}
/**
* 读取Pem文件中的密钥对，密钥支持包括：<br>
* <ul>
* <li>{@link PEMKeyPair}，默认读取私钥</li>
* <li>{@link PEMEncryptedKeyPair}，默认读取私钥</li>
* </ul>
*
* @param keyObject 密钥内容对象
* @param password 密码（部分加密的pem使用）
* @return {@link KeyPair}
* @throws CryptoException 读取异常或不支持的类型
*/
private static KeyPair readPemKeyPairFromKeyObject(final Object keyObject, final char[] password) throws CryptoException {
if (keyObject instanceof PEMKeyPair) {
// PemKeyPair
return getKeyPair((PEMKeyPair) keyObject);
} else if (keyObject instanceof PEMEncryptedKeyPair) {
// Encrypted PemKeyPair
final PEMKeyPair pemKeyPair = decrypt((PEMEncryptedKeyPair) keyObject, password);
return new KeyPair(getPublicKey(pemKeyPair.getPublicKeyInfo()), getPrivateKey(pemKeyPair.getPrivateKeyInfo()));
} else {
// 表示无法识别的密钥类型
throw new CryptoException("Unsupported key object type: {}", keyObject.getClass());
}
}
}