TKSS-486: SM2KeyPairGenerator::initialize should not raise NullPointe…

…rException
Tencent · Oct 21, 2023 · 3327592 · 3327592
1 parent 832def5
commit 3327592
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/kona-crypto/src/main/java/com/tencent/kona/crypto/provider/SM2KeyPairGenerator.java b/kona-crypto/src/main/java/com/tencent/kona/crypto/provider/SM2KeyPairGenerator.java
@@ -55,7 +55,7 @@ public void initialize(int keySize, SecureRandom random) {
 
     @Override
     public void initialize(AlgorithmParameterSpec params, SecureRandom random) {
-        if (!(params instanceof SM2ParameterSpec)
+        if (params == null || !(params instanceof SM2ParameterSpec)
                 && !KnownOIDs.curveSM2.value().equals(
                         ((NamedCurve) params).getObjectId())) {
             throw new IllegalArgumentException(

diff --git a/kona-crypto/src/test/java/com/tencent/kona/crypto/provider/SM2KeyPairGeneratorTest.java b/kona-crypto/src/test/java/com/tencent/kona/crypto/provider/SM2KeyPairGeneratorTest.java
@@ -61,7 +61,7 @@ public void testInitialize() throws Exception {
         keyPairGen.initialize(SM2ParameterSpec.instance());
         Assertions.assertThrows(IllegalArgumentException.class,
                 () -> keyPairGen.initialize(CurveDB.P_256));
-        Assertions.assertThrows(NullPointerException.class,
+        Assertions.assertThrows(IllegalArgumentException.class,
                 () -> keyPairGen.initialize(null));
     }