加解密参数中的加密类型检查

mainFactory/src/main/java/org/bfkj/utils/DataEncryption.java

@@ -16,6 +16,7 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Base64;
+import java.util.Objects;
 
 public class DataEncryption {
 
@@ -274,7 +275,7 @@ public class DataEncryption {
      */
     public static String encryptByPublicKey(String data, String publicKeyStr, String type, String algorithm) throws Exception {
         //根据X509编码密钥规范产生公钥对象
-        PublicKey publicKey = getPublicKey(publicKeyStr, type);
+        PublicKey publicKey = getPublicKey(publicKeyStr, checkType(type));
         //根据转换的名称获取密码对象Cipher（转换的名称：算法/工作模式/填充模式）
         Cipher cipher = Cipher.getInstance(algorithm);
         //用公钥初始化此Cipher对象（加密模式）
@@ -295,7 +296,7 @@ public class DataEncryption {
      */
     public static String encryptByPrivateKey(String data, String privateKeyStr, String type, String algorithm) throws Exception {
         //根据X509编码密钥规范产生公钥对象
-        PrivateKey privateKey = getPrivateKey(privateKeyStr, type);
+        PrivateKey privateKey = getPrivateKey(privateKeyStr, checkType(type));
         //根据转换的名称获取密码对象Cipher（转换的名称：算法/工作模式/填充模式）
         Cipher cipher = Cipher.getInstance(algorithm);
         //用公钥初始化此Cipher对象（加密模式）
@@ -317,7 +318,7 @@ public class DataEncryption {
     public static String decryptByPrivateKey(String data, String privateKeyStr, String type, String algorithm) throws Exception {
 
         //根据PKCS8编码密钥规范产生私钥对象
-        PrivateKey privateKey = getPrivateKey(privateKeyStr, type);
+        PrivateKey privateKey = getPrivateKey(privateKeyStr, checkType(type));
         //根据转换的名称获取密码对象Cipher（转换的名称：算法/工作模式/填充模式）
         Cipher cipher = Cipher.getInstance(algorithm);
         //用私钥初始化此Cipher对象（解密模式）
@@ -339,7 +340,7 @@ public class DataEncryption {
     public static String decryptByPublicKey(String data, String publicKeyStr, String type, String algorithm) throws Exception {
 
         //根据PKCS8编码密钥规范产生私钥对象
-        PublicKey publicKey = getPublicKey(publicKeyStr, type);
+        PublicKey publicKey = getPublicKey(publicKeyStr, checkType(type));
         //根据转换的名称获取密码对象Cipher（转换的名称：算法/工作模式/填充模式）
         Cipher cipher = Cipher.getInstance(algorithm);
         //用私钥初始化此Cipher对象（解密模式）
@@ -353,7 +354,7 @@ public class DataEncryption {
 
     public static String signatureSHA(String data, String algorithm) throws NoSuchAlgorithmException {
         // 创建MessageDigest对象，指定使用SHA算法
-        MessageDigest md = MessageDigest.getInstance(algorithm);
+        MessageDigest md = MessageDigest.getInstance(checkSHAAlgorithm(algorithm));
 
         // 将数据转换为字节数组
         byte[] dataBytes = data.getBytes();
@@ -372,7 +373,7 @@ public class DataEncryption {
 
 
     public static boolean verifySHA(String encryptedData, String algorithm, String sourceData) throws Exception {
-        return signatureSHA(sourceData, algorithm).equals(encryptedData);
+        return signatureSHA(sourceData, checkSHAAlgorithm(algorithm)).equals(encryptedData);
     }
 
 
@@ -394,6 +395,9 @@ public class DataEncryption {
 
         return sb.toString();
     }
+    public static boolean verifyMD5(String data,String encryptedData) throws NoSuchAlgorithmException {
+        return signatureMD5(data).equals(encryptedData);
+    }
 
 
     private static PublicKey getPublicKey(String publicKeyStr, String type) throws NoSuchAlgorithmException, InvalidKeySpecException {
@@ -427,7 +431,7 @@ public class DataEncryption {
         //创建PKCS8编码密钥规范
         PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(priKey);
         //返回转换指定算法的KeyFactory对象
-        KeyFactory keyFactory = KeyFactory.getInstance(type);
+        KeyFactory keyFactory = KeyFactory.getInstance(checkSingType(type));
         //根据PKCS8编码密钥规范产生私钥对象
         PrivateKey privateKey = keyFactory.generatePrivate(pkcs8KeySpec);
         //用指定算法产生签名对象Signature
@@ -458,7 +462,7 @@ public class DataEncryption {
 
     private static boolean verify(byte[] data, byte[] sign, byte[] pubKey, String type, String algorithm) throws Exception {
         //返回转换指定算法的KeyFactory对象
-        KeyFactory keyFactory = KeyFactory.getInstance(type);
+        KeyFactory keyFactory = KeyFactory.getInstance(checkSingType(type));
         //创建X509编码密钥规范
         X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pubKey);
         //根据X509编码密钥规范产生公钥对象
@@ -472,4 +476,36 @@ public class DataEncryption {
         //得到验证结果
         return signature.verify(sign);
     }
+
+
+    private static String checkType(String type) {
+        if (Objects.isNull(type)) return "RSA";
+        if (type.equalsIgnoreCase("RSA")) {
+            return type.toUpperCase();
+        }
+        return "RSA";
+    }
+    private static String checkSingType(String type) {
+        if (Objects.isNull(type)) return "RSA";
+        switch (type.toUpperCase()) {
+            case "RSA","DSA" -> {
+                return type.toUpperCase();
+            }
+            default -> {
+                return "RSA";
+            }
+        }
+    }
+
+    private static String checkSHAAlgorithm(String algorithm) {
+        if (Objects.isNull(algorithm)) return "SHA-256";
+        switch (algorithm.toUpperCase()) {
+            case "SHA-256", "SHA-1", "SHA-224", "SHA-384", "SHA-512" -> {
+                return algorithm.toUpperCase();
+            }
+            default -> {
+                return "SHA-256";
+            }
+        }
+    }
 }

mainFactory/src/main/java/org/bfkj/utils/GenerateImage.java

@@ -23,7 +23,7 @@ public class GenerateImage {
             new Color(0, 255, 0),
             new Color(255, 0, 0)
     };
-    private static SecureRandom RANDOM = new SecureRandom();
+    private static final SecureRandom RANDOM = new SecureRandom();
 
     public static String createCode(int size, String source) {
         StringBuilder verifyCode = new StringBuilder(size);