Merge pull request #2820 from CherryRum/lin_dev

fix: 修复sm2构造方法NullPointerException
dromara · Dec 27, 2022 · b596be1 · b596be1
2 parents f4c46d5 + 988e59e
commit b596be1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/ECKeyUtil.java b/hutool-crypto/src/main/java/cn/hutool/crypto/ECKeyUtil.java
@@ -244,6 +244,9 @@ public static ECPrivateKeyParameters toSm2PrivateParams(BigInteger d) {
 	 * @return ECPrivateKeyParameters
 	 */
 	public static ECPrivateKeyParameters toPrivateParams(String d, ECDomainParameters domainParameters) {
+		if (null == d) {
+			return null;
+		}
 		return toPrivateParams(BigIntegers.fromUnsignedByteArray(SecureUtil.decode(d)), domainParameters);
 	}
 

diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java
@@ -219,6 +219,17 @@ public void sm2WithPointTest() {
 		Assert.assertTrue(sm2.verifyHex(data, sign));
 	}
 
+	@Test
+	public void sm2WithNullPriPointTest() {
+		String x = "9EF573019D9A03B16B0BE44FC8A5B4E8E098F56034C97B312282DD0B4810AFC3";
+		String y = "CC759673ED0FC9B9DC7E6FA38F0E2B121E02654BF37EA6B63FAF2A0D6013EADF";
+		String q = "04" + x + y;
+		final SM2 sm1 = new SM2(null, x, y);
+		final SM2 sm2 = new SM2(null, q);
+        Assert.assertNotNull(sm1);
+		Assert.assertNotNull(sm2);
+	}
+
 	@Test
 	public void sm2PlainWithPointTest() {
 		// 测试地址：https://i.goto327.top/CryptTools/SM2.aspx?tdsourcetag=s_pctim_aiomsg