From 1323c0b3463c5486be9d5e5310782aeb9023697c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 15 十一月 2021 11:31:56 +0800
Subject: [PATCH] 2021-11-15 1.更新
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java | 155 ++-------------------------------------------------
1 files changed, 7 insertions(+), 148 deletions(-)
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java
index 00f83b7..f05ba51 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/utils/AesUtil.java
@@ -3,22 +3,16 @@
import com.hdl.sdk.common.utils.LogUtils;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
import java.security.NoSuchAlgorithmException;
-import java.security.Security;
-
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-
-import cn.hutool.core.util.HexUtil;
/**
* Aes 鍔犺В瀵嗗伐鍏风被
@@ -28,13 +22,13 @@
*/
public class AesUtil {
- private static final String CIPHER_INSTANCE = "AES/ECB/PKCS5Padding";
+ private static final String CIPHER_INSTANCE = "AES/CBC/PKCS7Padding";
private static final String AES_ALGORITHM = "AES";
- static {
- //AES/CBC/PKCS7Padding 渚濊禆
- Security.addProvider(new BouncyCastleProvider());
- }
+// static {
+// //AES/CBC/PKCS7Padding 渚濊禆
+// Security.addProvider(new BouncyCastleProvider());
+// }
/**
* AES鍔犲瘑
@@ -44,7 +38,7 @@
* @throws Exception
*/
public static byte[] aesEncrypt(byte[] content, String key) {
- return encrypt(content, key.getBytes(), "AES/CBC/PKCS7Padding", true, null);
+ return encrypt(content, key.getBytes(), CIPHER_INSTANCE, true, null);
}
/**
@@ -55,52 +49,9 @@
* @throws Exception
*/
public static byte[] aesDecrypt(byte[] content, String key) {
- return decrypt(content, key.getBytes(), "AES/CBC/PKCS7Padding", true, null);
+ return decrypt(content, key.getBytes(), CIPHER_INSTANCE, true, null);
}
- /**
- * 鍔犲瘑
- *
- * @param content 寰呭姞瀵嗗瓧绗︿覆
- * @param keyHex aesKye鐨刪exStr
- * @return
- */
- public static String encrypt(String content, String keyHex) {
- return HexUtil.encodeHexStr(encrypt(content.getBytes(), HexUtil.decodeHex(keyHex), CIPHER_INSTANCE, false, null));
- }
-
- /**
- * 鍔犲瘑
- *
- * @param content 寰呭姞瀵嗗瓧绗︿覆
- * @param key 瀵嗛挜
- * @return
- */
- public static String encrypt(String content, byte[] key) {
- return HexUtil.encodeHexStr(encrypt(content.getBytes(), key, CIPHER_INSTANCE, false, null));
- }
-
- /**
- * 鍔犲瘑
- *
- * @param content 寰呭姞瀵嗗瓧绗︿覆
- * @param keyHex aesKye鐨刪exStr
- * @return
- */
- public static byte[] encryptReturnByte(String content, String keyHex) {
- return encrypt(content.getBytes(), HexUtil.decodeHex(keyHex), CIPHER_INSTANCE, false, null);
- }
-
- /**
- * 鍔犲瘑
- *
- * @param content 寰呭姞瀵嗗瓧绗︿覆
- * @param key 瀵嗛挜
- * @return
- */
- public static byte[] encryptReturnByte(String content, byte[] key) {
- return encrypt(content.getBytes(), key, CIPHER_INSTANCE, false, null);
- }
/**
* 鍔犲瘑
@@ -149,51 +100,6 @@
/**
* 瑙ｅ瘑
*
- * @param contentHex 寰呰В瀵嗗緟瀛楃涓瞙exStr
- * @param keyHex desKye鐨刪exStr
- * @return
- */
- public static String decrypt(String contentHex, String keyHex) {
- return new String(decrypt(HexUtil.decodeHex(contentHex), HexUtil.decodeHex(keyHex), CIPHER_INSTANCE, false, null));
- }
-
- /**
- * 瑙ｅ瘑
- *
- * @param contentHex 寰呰В瀵嗗緟瀛楃涓瞙exStr
- * @param key 瀵嗛挜
- * @return
- */
- public static String decrypt(String contentHex, byte[] key) {
- return new String(decrypt(HexUtil.decodeHex(contentHex), key, CIPHER_INSTANCE, false, null));
- }
-
- /**
- * 瑙ｅ瘑
- *
- * @param content 寰呰В瀵嗗緟鍐呭
- * @param keyHex 瀵嗛挜
- * @return
- */
- public static String decrypt(byte[] content, String keyHex) {
- return new String(decrypt(content, HexUtil.decodeHex(keyHex), CIPHER_INSTANCE, false, null));
- }
-
- /**
- * 瑙ｅ瘑
- *
- * @param content 寰呰В瀵嗗緟鍐呭
- * @param key 瀵嗛挜
- * @return
- */
- public static String decrypt(byte[] content, byte[] key) {
- return new String(decrypt(content, key, CIPHER_INSTANCE, false, null));
- }
-
-
- /**
- * 瑙ｅ瘑
- *
* @param contentByte 寰呰В瀵嗗緟瀛楃涓瞙exStr
* @param contentByte 瀵嗛挜
* @param cipherInstance AES绠楁硶濉厖鏂瑰紡
@@ -235,51 +141,4 @@
return null;
}
-
- public static void main(String[] args) {
-// jiemi();
- //jiami();
- }
-
- public static void jiami() {
- String key = "1f6714fc-fb9b-4a";
- String content = "{\"id\":\"123\",\"objects\":[{\"sid\":\"0001011565879801020200010101\",\"type\":\"PWD\",\"local_id\":\"2\"}],\"time_stamp\":\"1603281282000\"}";
- byte[] res = aesEncrypt(content.getBytes(), key);
- System.out.println(HexUtil.encodeHexStr(res));
- }
-
-// /**
-// *
-// * @param str
-// * @param houseId
-// * @return
-// */
-// public static String jiemi(byte[] str, String houseId) {
-// byte[] rs = aesDecrypt(str, HouseIdSecretUtil.getSecret(houseId));
-// String content = new String(rs);
-// return content;
-// }
-
-// public static void main(String[] args) {
-// try {
-// //绗竴姝ワ細 鐢熸垚KEY
-// //KeyGenerator keyGenerator = KeyGenerator.getInstance(AES_ALGORITHM);
-// //keyGenerator.init(256);
-// //绗簩姝ワ細 浜х敓瀵嗛挜
-// //SecretKey secretKey = keyGenerator.generateKey();
-// //绗笁姝ワ細 鑾峰彇瀵嗛挜
-// //byte[] keyBytes = secretKey.getEncoded();
-// //System.out.println(byteArrayToHexStr(keyBytes));
-// String src = "aaaaaaaaaVVVVaaaAAAA鏃�";
-// String pwd = "41151AF257BFDB7859EEC62FB341EE95EE42E648FE24E1F8CE8DADE287CC1E5C";
-// String mw = encrypt(src,pwd);
-// System.out.println("mw:"+mw);
-// String jm = decrypt(mw,pwd);
-// System.out.println("jm:"+jm);
-//
-// }catch (Exception e){
-//
-// }
-//
-// }
}
--
Gitblit v1.8.0