update code for asymDec

liuchen · liuchen · commit f74d7fc3f2b5 · 2022-08-22T14:12:40.000+08:00
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java b/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java
@@ -722,8 +722,7 @@ private Chainsql createTable(String name, List<String> rawList, JSONObject opera
 		String strRaw = listRaw.toString();
 		String token = "";
 		if(confidential){
-
-			boolean bSM = ( Utils.getAlgType(this.connection.secret).equals("softGMAlg") );
+            boolean bSM = Utils.getAlgType(this.connection.secret).equals(Define.algType.gmalg);
 			int randomSize = bSM? PASSWORD_LENGTH /2 :PASSWORD_LENGTH ;
 
 			byte[] password = Util.getRandomBytes(randomSize);
@@ -1858,26 +1857,10 @@ public String asymDecrypt(String cipher, String privateKey, boolean bSM) {
 	 * 非对称解密接口
 	 * @param cipher 密文
 	 * @param privateKey 加密密钥
-	 * @param bSM 是否使用国密算法。如果使用国密算法，注意密钥是16位。
 	 * @return 明文，解密失败返回""
 	 */
 	public String asymDecrypt(String cipher, String privateKey) {
-		byte[] cipherBytes = Util.hexToBytes(cipher);
-		byte[] seedBytes = null;
-        Define.algType priAlgType = Utils.getAlgType(privateKey);
-        switch(priAlgType) {
-            case gmalg:
-                seedBytes   = getB58IdentiferCodecs().decodeAccountPrivate(privateKey);
-                break;
-            case secp256k1:
-                seedBytes = getB58IdentiferCodecs().decodeFamilySeed(privateKey);
-                break;
-            default:
-                return new String("");
-        }
-        byte[] plainBytes = EncryptCommon.asymDecrypt(cipherBytes, seedBytes, 
-                                                        priAlgType.equals(Define.algType.gmalg));
-		return new String(plainBytes);
+		return Util.asymDec(cipher, privateKey);
 	}
 	
 	
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/util/Util.java b/chainsql/src/main/java/com/peersafe/chainsql/util/Util.java
@@ -473,29 +473,42 @@ public static String encryptRaw(Connection connection,String token,String strRaw
 			return strRaw;
 		}
 		try {
-			byte[] seedBytes = null;
-
-			boolean bSoftGM = Utils.getAlgType(connection.secret).equals("softGMAlg");
-			if(!connection.secret.isEmpty()){
-
-				if(bSoftGM){
-					seedBytes   = getB58IdentiferCodecs().decodeAccountPrivate(connection.secret);
-				}else{
-					seedBytes = getB58IdentiferCodecs().decodeFamilySeed(connection.secret);
-				}
-
-			}
-
-			byte[] password = EncryptCommon.asymDecrypt(Util.hexToBytes(token), seedBytes,bSoftGM) ;
+            String password = asymDec(token, connection.secret);
+			boolean bSoftGM = Utils.getAlgType(connection.secret).equals(Define.algType.gmalg);
 			if(password == null){
 				throw new Exception("Exception: decrypt token failed");
 			}
-			byte[] rawBytes = EncryptCommon.symEncrypt( strRaw.getBytes(),password,bSoftGM);
+			byte[] rawBytes = EncryptCommon.symEncrypt( strRaw.getBytes(), password.getBytes(), bSoftGM);
 			strRaw = Util.bytesToHex(rawBytes);
 			return strRaw;
 		} catch (Exception e) {
 			e.printStackTrace();
 			return strRaw;
 		}
 	}
+
+    /**
+	 * 非对称解密接口
+	 * @param cipher 密文
+	 * @param privateKey 加密密钥
+	 * @return 明文，解密失败返回""
+	 */
+	public static String asymDec(String cipher, String privateKey) {
+		byte[] cipherBytes = Util.hexToBytes(cipher);
+		byte[] seedBytes = null;
+        Define.algType priAlgType = Utils.getAlgType(privateKey);
+        switch(priAlgType) {
+            case gmalg:
+                seedBytes   = getB58IdentiferCodecs().decodeAccountPrivate(privateKey);
+                break;
+            case secp256k1:
+                seedBytes = getB58IdentiferCodecs().decodeFamilySeed(privateKey);
+                break;
+            default:
+                return new String("");
+        }
+        byte[] plainBytes = EncryptCommon.asymDecrypt(cipherBytes, seedBytes, 
+                                                        priAlgType.equals(Define.algType.gmalg));
+		return new String(plainBytes);
+	}
 }
