when use a unknow alg throw err

liuchen · liuchen · commit 1de603130f80 · 2022-08-01T15:22:18.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 
 */target/
 
+*.jar
+
 # VScode config files
 .vscode/
 
diff --git a/chainsql/src/main/java/com/peersafe/base/crypto/ecdsa/Seed.java b/chainsql/src/main/java/com/peersafe/base/crypto/ecdsa/Seed.java
@@ -83,10 +83,8 @@ public IKeyPair keyPair(int account) {
             if(seedBytes.length == 32){
                 return SMKeyPair.from256Seed(seedBytes);
             }else{
-                //  软国密算法 暂不支持16字节的seed 生成公私钥对
                 return SMKeyPair.generateKeyPair();
             }
-
         }
         else {
             return createKeyPair(seedBytes, account);
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java b/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java
@@ -1489,16 +1489,14 @@ public JSONObject generateAddress(JSONObject options){
 					version = Seed.VER_SOFT_SM;
 					break;
 				default:
-					version = Seed.VER_ED25519;
+                    throw new IllegalArgumentException("Unknown algorithm, please check!");
 			}
 		}
 
 		Seed seed;
 		if(options.has("secret")){
-
 			String sSecret = options.getString("secret");
 			seed = Seed.fromBase58(sSecret);
-
 		}else{
 			seed = Seed.randomSeed(version);
 		}

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,8 @@ public IKeyPair keyPair(int account) {`
`83`	`83`	`if(seedBytes.length == 32){`
`84`	`84`	`return SMKeyPair.from256Seed(seedBytes);`
`85`	`85`	`}else{`
`86`		`- // 软国密算法暂不支持16字节的seed 生成公私钥对`
`87`	`86`	`return SMKeyPair.generateKeyPair();`
`88`	`87`	`}`
`89`		`-`
`90`	`88`	`}`
`91`	`89`	`else {`
`92`	`90`	`return createKeyPair(seedBytes, account);`
Original file line number	Diff line number	Diff line change
`@@ -1489,16 +1489,14 @@ public JSONObject generateAddress(JSONObject options){`
`1489`	`1489`	`version = Seed.VER_SOFT_SM;`
`1490`	`1490`	`break;`
`1491`	`1491`	`default:`
`1492`		`- version = Seed.VER_ED25519;`
	`1492`	`+ throw new IllegalArgumentException("Unknown algorithm, please check!");`
`1493`	`1493`	`}`
`1494`	`1494`	`}`
`1495`	`1495`
`1496`	`1496`	`Seed seed;`
`1497`	`1497`	`if(options.has("secret")){`
`1498`		`-`
`1499`	`1498`	`String sSecret = options.getString("secret");`
`1500`	`1499`	`seed = Seed.fromBase58(sSecret);`
`1501`		`-`
`1502`	`1500`	`}else{`
`1503`	`1501`	`seed = Seed.randomSeed(version);`
`1504`	`1502`	`}`