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

fix code

Browse Source
This commit is contained in:
Looly 2024-08-15 16:57:05 +08:00
parent 13afb47a42
commit f806e3b855
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hutool-crypto/src/main/java/org/dromara/hutool/crypto/asymmetric/SM2.java
View File

@ -41,6 +41,7 @@ import org.dromara.hutool.crypto.bc.SmUtil;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.PrivateKey; import java.security.PrivateKey;
import java.security.PublicKey; import java.security.PublicKey;
import java.security.SecureRandom;
/** /**
* 国密SM2非对称算法实现，基于BC库<br> * 国密SM2非对称算法实现，基于BC库<br>
@ -71,6 +72,10 @@ public class SM2 extends AbstractAsymmetricCrypto<SM2> {
private ECPrivateKeyParameters privateKeyParams; private ECPrivateKeyParameters privateKeyParams;
private ECPublicKeyParameters publicKeyParams; private ECPublicKeyParameters publicKeyParams;
/**
* 自定义随机数
*/
private SecureRandom random;
private DSAEncoding encoding = StandardDSAEncoding.INSTANCE; private DSAEncoding encoding = StandardDSAEncoding.INSTANCE;
private Digest digest = new SM3Digest(); private Digest digest = new SM3Digest();
@ -238,7 +243,7 @@ public class SM2 extends AbstractAsymmetricCrypto<SM2> {
if (KeyType.PublicKey != keyType) { if (KeyType.PublicKey != keyType) {
throw new IllegalArgumentException("Encrypt is only support by public key"); throw new IllegalArgumentException("Encrypt is only support by public key");
} }
return encrypt(data, new ParametersWithRandom(getCipherParameters(keyType))); return encrypt(data, new ParametersWithRandom(getCipherParameters(keyType), this.random));
} }
/** /**
@ -366,7 +371,7 @@ public class SM2 extends AbstractAsymmetricCrypto<SM2> {
lock.lock(); lock.lock();
final SM2Signer signer = getSigner(); final SM2Signer signer = getSigner();
try { try {
CipherParameters param = new ParametersWithRandom(getCipherParameters(KeyType.PrivateKey)); CipherParameters param = new ParametersWithRandom(getCipherParameters(KeyType.PrivateKey), this.random);
if (id != null) { if (id != null) {
param = new ParametersWithID(param, id); param = new ParametersWithID(param, id);
} }
@ -483,6 +488,17 @@ public class SM2 extends AbstractAsymmetricCrypto<SM2> {
return this; return this;
} }
/**
* 设置随机数生成器，可自定义随机数种子
*
* @param random 随机数生成器，可自定义随机数种子
* @return this
*/
public SM2 setRandom(final SecureRandom random) {
this.random = random;
return this;
}
/** /**
* 设置DSA signatures的编码为PlainDSAEncoding * 设置DSA signatures的编码为PlainDSAEncoding
* *

2
hutool-crypto/src/main/java/org/dromara/hutool/crypto/bc/BCCipher.java
View File

@ -224,7 +224,7 @@ public class BCCipher implements Cipher, Wrapper<Object> {
/** /**
* 算法的参数 * 算法的参数
*/ */
private final CipherParameters parameters; protected final CipherParameters parameters;
/** /**
* 构造 * 构造