Fix EvpSignatureTest and EvpSignatureSpecificTest

corretto · Dec 13, 2023 · 92f612b · 92f612b
1 parent 0c5a7b8
commit 92f612b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/tst/com/amazon/corretto/crypto/provider/test/EvpSignatureSpecificTest.java b/tst/com/amazon/corretto/crypto/provider/test/EvpSignatureSpecificTest.java
@@ -770,14 +770,14 @@ private static void simpleCorrectnessSignVerify(
   }
 
   @Test
-  public void ecdsaAcceptsNullParams() throws Exception {
+  public void ecdsaRejectsNullParams() throws Exception {
     final Signature signer = Signature.getInstance("SHA384withECDSA", NATIVE_PROVIDER);
     signer.initSign(ECDSA_PAIR.getPrivate());
-    signer.setParameter(null);
+    assertThrows(InvalidAlgorithmParameterException.class, () -> signer.setParameter(null));
     signer.update(MESSAGE);
     final byte[] signature = signer.sign();
     signer.initVerify(ECDSA_PAIR.getPublic());
-    signer.setParameter(null);
+    assertThrows(InvalidAlgorithmParameterException.class, () -> signer.setParameter(null));
     signer.update(MESSAGE);
     assertTrue(signer.verify(signature));
   }

diff --git a/tst/com/amazon/corretto/crypto/provider/test/EvpSignatureTest.java b/tst/com/amazon/corretto/crypto/provider/test/EvpSignatureTest.java
@@ -87,10 +87,14 @@ public TestParams(
       this.paramSpec = paramSpec;
 
       signer = getNativeSigner();
-      signer.setParameter(paramSpec);
+      if (paramSpec != null) {
+          signer.setParameter(paramSpec);
+      }
       signer.initSign(keyPair.getPrivate());
       verifier = getNativeSigner();
-      verifier.setParameter(paramSpec);
+      if (paramSpec != null) {
+          verifier.setParameter(paramSpec);
+      }
       verifier.initVerify(keyPair.getPublic());
 
       jceVerifier = getJceSigner();