modify asymDecrypt in C cd /Users/lascion/lcworkspace/gitrepo/java-chainsql-api ; /usr/bin/env /Library/Java/JavaVirtualMachines/jdk1.8.0_321.jdk/Contents/Home/bin/java -agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=localhost:60798 -cp /var/folders/5q/_0kvhxls1px1q_61zmw0rcth0000gn/T/cp_ehqfkhjnzhnajw7bysrct33ux.jar com.peersafe.example.chainsql.TestChainsql hainsql.java

liuchen · liuchen · commit dc2eff36a727 · 2022-08-22T13:55:52.000+08:00
diff --git a/chainsql/src/main/java/com/peersafe/base/client/Client.java b/chainsql/src/main/java/com/peersafe/base/client/Client.java
@@ -19,7 +19,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.peersafe.chainsql.crypto.EncryptCommon;
 import com.peersafe.chainsql.manager.CallbackManager;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -2189,7 +2188,6 @@ public JSONObject getTransaction(String hash) {
 	    return getResult(request);
     }
     
-    
     /**
      * Request for a transaction's information.
      * @param hash Transaction hash.
diff --git a/chainsql/src/main/java/com/peersafe/base/utils/Utils.java b/chainsql/src/main/java/com/peersafe/base/utils/Utils.java
@@ -8,6 +8,7 @@
 import com.peersafe.base.encodings.common.B16;
 import org.bouncycastle.crypto.digests.RIPEMD160Digest;
 import org.bouncycastle.crypto.digests.SHA256Digest;
+import com.peersafe.chainsql.util.Define.algType;
 
 import static com.peersafe.base.config.Config.getB58IdentiferCodecs;
 
@@ -66,17 +67,18 @@ public  static  String deriveAddressFromBytes(byte[] pubBytes){
 	}
 
 
-	public static String getAlgType(String secret){
-
+	public static algType getAlgType(String secret){
+        if(secret.isEmpty()) {
+            return algType.unknown;
+        }
 		String regEx = "^[a-zA-Z1-9]{51,51}";
 		Pattern pattern = Pattern.compile(regEx);
 		Matcher matcher = pattern.matcher(secret);
 
     	if(matcher.matches()){
-
-    		return "softGMAlg";
+    		return algType.gmalg;
 		}else{
-    		return "secp256k1";
+    		return algType.secp256k1;
 		}
 	}
 }
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java b/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java
@@ -9,8 +9,6 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import com.peersafe.chainsql.pool.ChainsqlPool;
 import org.bouncycastle.crypto.digests.RIPEMD160Digest;
@@ -42,6 +40,7 @@
 import com.peersafe.chainsql.util.GenericPair;
 import com.peersafe.chainsql.util.Util;
 import com.peersafe.chainsql.util.Validate;
+import com.peersafe.chainsql.util.Define;
 
 public class Chainsql extends Submit {
 
@@ -960,19 +959,7 @@ public Chainsql grant(String name, String user,String userPublicKey,String flag)
 		String newToken = "";
 		if(token.length() != 0){
 			try {
-				byte[] seedBytes = null;
-
-				boolean bSoftGM = Utils.getAlgType(this.connection.secret).equals("softGMAlg");
-				if(!this.connection.secret.isEmpty()){
-
-					if(bSoftGM){
-						seedBytes   = getB58IdentiferCodecs().decodeAccountPrivate(this.connection.secret);
-					}else{
-						seedBytes = getB58IdentiferCodecs().decodeFamilySeed(this.connection.secret);
-					}
-
-				}
-				byte[] password = EncryptCommon.asymDecrypt(Util.hexToBytes(token), seedBytes,bSoftGM) ;
+                byte[] password = this.asymDecrypt(token, this.connection.secret).getBytes();
 				if(password == null){
 					return null;
 				}
@@ -1434,7 +1421,7 @@ public JSONObject getExplicitTransaction(String hash, String privateKey){
 			try {
 				//token = Util.getUserToken(this.connection, this.connection.address, name);
 				if(token != "") {
-		   	 		String password = this.asymDecrypt(token, privateKey, false);
+		   	 		String password = this.asymDecrypt(token, privateKey);
 		   	 		Util.decryptData(password.getBytes(), tx);
 		   	 	}
 			} catch (Exception e) {
@@ -1856,20 +1843,42 @@ public String asymEncrypt(String plainText, String publicKey, boolean bSM) {
 	public String asymDecrypt(String cipher, String privateKey, boolean bSM) {
 		byte[] cipherBytes = Util.hexToBytes(cipher);
 		byte[] seedBytes = null;
-		
-		bSM = Utils.getAlgType(connection.secret).equals("softGMAlg");
-    	if(bSM){
-    		seedBytes   = getB58IdentiferCodecs().decodeAccountPrivate(privateKey);
-    		bSM = true;
-        }
-    	else{
-    		seedBytes   = getB58IdentiferCodecs().decodeFamilySeed(privateKey);
-    		bSM = false;
-    	}
+
+        if(bSM) {
+			seedBytes   = getB58IdentiferCodecs().decodeAccountPrivate(privateKey);
+		}else {
+			seedBytes   = getB58IdentiferCodecs().decodeFamilySeed(privateKey);
+		}
 		
         byte[] newBytes = EncryptCommon.asymDecrypt(cipherBytes, seedBytes, bSM);
 		return new String(newBytes);
 	}
+
+    /**
+	 * 非对称解密接口
+	 * @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);
+	}
 	
 	
 	/**
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/util/Define.java b/chainsql/src/main/java/com/peersafe/chainsql/util/Define.java
@@ -0,0 +1,11 @@
+package com.peersafe.chainsql.util;
+
+public class Define {
+    public static enum algType {
+        unknown,
+        gmalg,
+        secp256k1,
+        ed25519,
+        hdGmAlg;
+    }
+}
