fix code

hutool-crypto/src/main/java/cn/hutool/crypto/CipherMode.java

@@ -0,0 +1,49 @@
+package cn.hutool.crypto;
+
+import javax.crypto.Cipher;
+
+/**
+ * Cipher模式的枚举封装
+ *
+ * @author looly
+ * @since 5.4.3
+ */
+public enum CipherMode {
+	/**
+	 * 加密模式
+	 */
+	encrypt(Cipher.ENCRYPT_MODE),
+	/**
+	 * 解密模式
+	 */
+	decrypt(Cipher.DECRYPT_MODE),
+	/**
+	 * 包装模式
+	 */
+	wrap(Cipher.WRAP_MODE),
+	/**
+	 * 拆包模式
+	 */
+	unwrap(Cipher.UNWRAP_MODE);
+
+
+	/**
+	 * 构造
+	 *
+	 * @param value 见{@link Cipher}
+	 */
+	CipherMode(int value) {
+		this.value = value;
+	}
+
+	private final int value;
+
+	/**
+	 * 获取枚举值对应的int表示
+	 *
+	 * @return 枚举值对应的int表示
+	 */
+	public int getValue() {
+		return this.value;
+	}
+}

hutool-crypto/src/main/java/cn/hutool/crypto/KeyUtil.java

@@ -618,11 +618,19 @@ public class KeyUtil {
 	 */
 	public static String getAlgorithmAfterWith(String algorithm) {
 		Assert.notNull(algorithm, "algorithm must be not null !");
+
+		if(StrUtil.startWithIgnoreCase(algorithm, "ECIESWith")){
+			return "EC";
+		}
+
 		int indexOfWith = StrUtil.lastIndexOfIgnoreCase(algorithm, "with");
 		if (indexOfWith > 0) {
 			algorithm = StrUtil.subSuf(algorithm, indexOfWith + "with".length());
 		}
-		if ("ECDSA".equalsIgnoreCase(algorithm) || "SM2".equalsIgnoreCase(algorithm)) {
+		if ("ECDSA".equalsIgnoreCase(algorithm)
+				|| "SM2".equalsIgnoreCase(algorithm)
+				|| "ECIES".equalsIgnoreCase(algorithm)
+		) {
 			algorithm = "EC";
 		}
 		return algorithm;

hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/AsymmetricCrypto.java

@@ -3,6 +3,7 @@ package cn.hutool.crypto.asymmetric;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.io.FastByteArrayOutputStream;
 import cn.hutool.crypto.CryptoException;
+import cn.hutool.crypto.KeyUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
 
@@ -10,9 +11,12 @@ import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import java.io.IOException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
 import java.security.Key;
 import java.security.PrivateKey;
 import java.security.PublicKey;
+import java.security.spec.AlgorithmParameterSpec;
 
 /**
  * 非对称加密算法
@@ -26,19 +30,30 @@ import java.security.PublicKey;
  * </pre>
  *
  * @author Looly
- *
  */
 public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto> {
 
-	/** Cipher负责完成加密或解密工作 */
+	/**
+	 * Cipher负责完成加密或解密工作
+	 */
 	protected Cipher cipher;
 
-	/** 加密的块大小 */
+	/**
+	 * 加密的块大小
+	 */
 	protected int encryptBlockSize = -1;
-	/** 解密的块大小 */
+	/**
+	 * 解密的块大小
+	 */
 	protected int decryptBlockSize = -1;
 
+	/**
+	 * 算法参数
+	 */
+	private AlgorithmParameterSpec algorithmParameterSpec;
+
 	// ------------------------------------------------------------------ Constructor start
+
 	/**
 	 * 构造，创建新的私钥公钥对
 	 *
@@ -110,7 +125,7 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 
 	/**
 	 * 构造
-	 * 
+	 * <p>
 	 * 私钥和公钥同时为空时生成一对新的私钥和公钥<br>
 	 * 私钥和公钥可以单独传入一个，如此则只能使用此钥匙来做加密或者解密
 	 *
@@ -120,14 +135,14 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 	 */
 	public AsymmetricCrypto(String algorithm, byte[] privateKey, byte[] publicKey) {
 		this(algorithm, //
-				SecureUtil.generatePrivateKey(algorithm, privateKey), //
+				KeyUtil.generatePrivateKey(algorithm, privateKey), //
-				SecureUtil.generatePublicKey(algorithm, publicKey)//
+				KeyUtil.generatePublicKey(algorithm, publicKey)//
 		);
 	}
 
 	/**
 	 * 构造
-	 * 
+	 * <p>
 	 * 私钥和公钥同时为空时生成一对新的私钥和公钥<br>
 	 * 私钥和公钥可以单独传入一个，如此则只能使用此钥匙来做加密或者解密
 	 *
@@ -177,6 +192,28 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 		this.decryptBlockSize = decryptBlockSize;
 	}
 
+	/**
+	 * 获取{@link AlgorithmParameterSpec}<br>
+	 * 在某些算法中，需要特别的参数，例如在ECIES中，此处为IESParameterSpec
+	 *
+	 * @return {@link AlgorithmParameterSpec}
+	 * @since 5.4.3
+	 */
+	public AlgorithmParameterSpec getAlgorithmParameterSpec() {
+		return algorithmParameterSpec;
+	}
+
+	/**
+	 * 设置{@link AlgorithmParameterSpec}<br>
+	 * 在某些算法中，需要特别的参数，例如在ECIES中，此处为IESParameterSpec
+	 *
+	 * @param algorithmParameterSpec {@link AlgorithmParameterSpec}
+	 * @since 5.4.3
+	 */
+	public void setAlgorithmParameterSpec(AlgorithmParameterSpec algorithmParameterSpec) {
+		this.algorithmParameterSpec = algorithmParameterSpec;
+	}
+
 	@Override
 	public AsymmetricCrypto init(String algorithm, PrivateKey privateKey, PublicKey publicKey) {
 		super.init(algorithm, privateKey, publicKey);
@@ -185,6 +222,7 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 	}
 
 	// --------------------------------------------------------------------------------- Encrypt
+
 	/**
 	 * 加密
 	 *
@@ -197,7 +235,7 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 		final Key key = getKeyByType(keyType);
 		lock.lock();
 		try {
-			cipher.init(Cipher.ENCRYPT_MODE, key);
+			initCipher(Cipher.ENCRYPT_MODE, key);
 
 			if (this.encryptBlockSize < 0) {
 				// 在引入BC库情况下，自动获取块大小
@@ -216,6 +254,7 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 	}
 
 	// --------------------------------------------------------------------------------- Decrypt
+
 	/**
 	 * 解密
 	 *
@@ -228,7 +267,7 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 		final Key key = getKeyByType(keyType);
 		lock.lock();
 		try {
-			cipher.init(Cipher.DECRYPT_MODE, key);
+			initCipher(Cipher.DECRYPT_MODE, key);
 
 			if (this.decryptBlockSize < 0) {
 				// 在引入BC库情况下，自动获取块大小
@@ -252,11 +291,23 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 	 * 获得加密或解密器
 	 *
 	 * @return 加密或解密
+	 * @deprecated 拼写错误，请使用{@link #getCipher()}
 	 */
+	@Deprecated
 	public Cipher getClipher() {
 		return cipher;
 	}
 
+	/**
+	 * 获得加密或解密器
+	 *
+	 * @return 加密或解密
+	 * @since 5.4.3
+	 */
+	public Cipher getCipher() {
+		return cipher;
+	}
+
 	/**
 	 * 初始化{@link Cipher}，默认尝试加载BC库
 	 *
@@ -301,8 +352,7 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 	 */
 	private byte[] doFinalWithBlock(byte[] data, int maxBlockSize) throws IllegalBlockSizeException, BadPaddingException, IOException {
 		final int dataLength = data.length;
-		@SuppressWarnings("resource")
+		@SuppressWarnings("resource") final FastByteArrayOutputStream out = new FastByteArrayOutputStream();
-		final FastByteArrayOutputStream out = new FastByteArrayOutputStream();
 
 		int offSet = 0;
 		// 剩余长度
@@ -319,4 +369,20 @@ public class AsymmetricCrypto extends AbstractAsymmetricCrypto<AsymmetricCrypto>
 
 		return out.toByteArray();
 	}
+
+	/**
+	 * 初始化{@link Cipher}
+	 *
+	 * @param mode 模式，可选{@link Cipher#ENCRYPT_MODE}或者{@link Cipher#DECRYPT_MODE}
+	 * @param key  密钥
+	 * @throws InvalidAlgorithmParameterException 异常算法错误
+	 * @throws InvalidKeyException                异常KEY错误
+	 */
+	private void initCipher(int mode, Key key) throws InvalidAlgorithmParameterException, InvalidKeyException {
+		if (null != this.algorithmParameterSpec) {
+			cipher.init(mode, key, this.algorithmParameterSpec);
+		} else {
+			cipher.init(mode, key);
+		}
+	}
 }

hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/BaseAsymmetric.java

@@ -196,6 +196,6 @@ public class BaseAsymmetric<T extends BaseAsymmetric<T>> {
 				}
 				return this.publicKey;
 		}
-		throw new CryptoException("Uknown key type: " + type);
+		throw new CryptoException("Unsupported key type: " + type);
 	}
 }

hutool-crypto/src/main/java/cn/hutool/crypto/asymmetric/KeyType.java

@@ -1,5 +1,7 @@
 package cn.hutool.crypto.asymmetric;
 
+import javax.crypto.Cipher;
+
 /**
  * 密钥类型
  * 
@@ -7,5 +9,37 @@ package cn.hutool.crypto.asymmetric;
  *
  */
 public enum KeyType {
-	PrivateKey, PublicKey
+	/**
+	 * 公钥
+	 */
+	PublicKey(Cipher.PUBLIC_KEY),
+	/**
+	 * 私钥
+	 */
+	PrivateKey(Cipher.PRIVATE_KEY),
+	/**
+	 * 密钥
+	 */
+	SecretKey(Cipher.SECRET_KEY);
+
+
+	/**
+	 * 构造
+	 *
+	 * @param value 见{@link Cipher}
+	 */
+	KeyType(int value) {
+		this.value = value;
+	}
+
+	private final int value;
+
+	/**
+	 * 获取枚举值对应的int表示
+	 *
+	 * @return 枚举值对应的int表示
+	 */
+	public int getValue() {
+		return this.value;
+	}
 }

hutool-crypto/src/test/java/cn/hutool/crypto/test/KeyUtilTest.java

@@ -31,4 +31,19 @@ public class KeyUtilTest {
 		final PublicKey rsaPublicKey = KeyUtil.getRSAPublicKey(aPrivate);
 		Assert.assertEquals(rsaPublicKey, keyPair.getPublic());
 	}
+
+	/**
+	 * 测试EC和ECIES算法生成的KEY是一致的
+	 */
+	@Test
+	public void generateECIESKeyTest(){
+		final KeyPair ecies = KeyUtil.generateKeyPair("ECIES");
+		Assert.assertNotNull(ecies.getPrivate());
+		Assert.assertNotNull(ecies.getPublic());
+
+		byte[] privateKeyBytes = ecies.getPrivate().getEncoded();
+
+		final PrivateKey privateKey = KeyUtil.generatePrivateKey("EC", privateKeyBytes);
+		Assert.assertEquals(ecies.getPrivate(), privateKey);
+	}
 }

hutool-crypto/src/test/java/cn/hutool/crypto/test/asymmetric/ECIESTest.java

@@ -1,6 +1,7 @@
 package cn.hutool.crypto.test.asymmetric;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.asymmetric.AsymmetricCrypto;
 import cn.hutool.crypto.asymmetric.ECIES;
 import cn.hutool.crypto.asymmetric.KeyType;
 import org.junit.Assert;
@@ -12,6 +13,25 @@ public class ECIESTest {
 	public void eciesTest(){
 		final ECIES ecies = new ECIES();
 
+		doTest(ecies, ecies);
+	}
+
+	@Test
+	public void eciesTest2(){
+		final ECIES ecies = new ECIES();
+		final byte[] privateKeyBytes = ecies.getPrivateKey().getEncoded();
+		final ECIES ecies2 = new ECIES(privateKeyBytes, null);
+
+		doTest(ecies, ecies2);
+	}
+
+	/**
+	 * 测试用例
+	 *
+	 * @param cryptoForEncrypt 加密的Crypto
+	 * @param cryptoForDecrypt 解密的Crypto
+	 */
+	private void doTest(AsymmetricCrypto cryptoForEncrypt, AsymmetricCrypto cryptoForDecrypt){
 		String textBase = "我是一段特别长的测试";
 		StringBuilder text = new StringBuilder();
 		for (int i = 0; i < 10; i++) {
@@ -19,8 +39,9 @@ public class ECIESTest {
 		}
 
 		// 公钥加密，私钥解密
-		String encryptStr = ecies.encryptBase64(text.toString(), KeyType.PublicKey);
+		String encryptStr = cryptoForEncrypt.encryptBase64(text.toString(), KeyType.PublicKey);
-		String decryptStr = StrUtil.utf8Str(ecies.decrypt(encryptStr, KeyType.PrivateKey));
+
+		String decryptStr = StrUtil.utf8Str(cryptoForDecrypt.decrypt(encryptStr, KeyType.PrivateKey));
 		Assert.assertEquals(text.toString(), decryptStr);
 	}
 }