Check for return code on call to ICC_EVP_PKEY_derive

Author: jasonkatonica

src/main/java/com/ibm/crypto/plus/provider/XDHKeyAgreement.java

@@ -110,7 +110,7 @@ protected Key engineDoPhase(Key key, boolean lastPhase)
             this.secret = XECKey.computeECDHSecret(provider.getOCKContext(), genCtx,
                     ockXecKeyPub.getPKeyId(), ockXecKeyPriv.getPKeyId(), secrectBufferSize);
         } catch (OCKException e) {
-            throw new IllegalStateException(e.getMessage());
+            throw new IllegalStateException("Failed to generate secret", e);
         } catch (Exception e) {
             throw new InvalidKeyException("Failed to generate secret", e);
         }

src/main/native/ECKey.c

@@ -2119,6 +2119,7 @@ JNIEXPORT jbyteArray JNICALL Java_com_ibm_crypto_plus_provider_ock_NativeInterfa
   unsigned char *      secretBytesNative = NULL;
   jboolean             isCopy = 0;
   size_t               secret_key_len = 0;
+  int                  rc = 0;
 
   if (debug) {
     gslogFunctionEntry(functionName);
@@ -2143,7 +2144,10 @@ JNIEXPORT jbyteArray JNICALL Java_com_ibm_crypto_plus_provider_ock_NativeInterfa
       if (NULL == secretBytesNative) {
         throwOCKException(env, 0, "NULL from GetPrimitiveArrayCritical");
       } else {
-        ICC_EVP_PKEY_derive(ockCtx, gen_ctx, secretBytesNative, &secret_key_len);
+        rc = ICC_EVP_PKEY_derive(ockCtx, gen_ctx, secretBytesNative, &secret_key_len);
+        if (rc != ICC_OSSL_SUCCESS) {
+          throwOCKException(env, 0, "ICC_EVP_PKEY_derive failed to derive a key");
+        }
         ICC_EVP_PKEY_CTX_free(ockCtx, gen_ctx);
         (*env)->ReleasePrimitiveArrayCritical(env, secretBytes, secretBytesNative, 0);
         if (debug) {

src/test/java/ibm/jceplus/junit/base/BaseTestXDH.java

@@ -30,6 +30,7 @@
 import java.security.spec.XECPublicKeySpec;
 import java.util.Arrays;
 import javax.crypto.KeyAgreement;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import static org.junit.Assert.assertTrue;
 
@@ -336,20 +337,10 @@ private void runSmallOrderTest() throws Exception {
     private void testSmallOrder(String name, String a_pri, String b_pub, String result)
             throws Exception {
 
-        try {
-            //System.out.println("Pub - "+b_pub);
+        Exception thrown = Assertions.assertThrows(IllegalStateException.class, () -> {
             runDiffieHellmanTest(name, a_pri, b_pub, result);
-        } catch (InvalidKeyException ex) {
-            assertTrue(true);
-            return;
-        } catch (InvalidKeySpecException ex) {
-            assertTrue(true);
-            return;
-        } catch (Exception e1) {
-            System.out.println(e1.getMessage());
-        }
-
-        throw new RuntimeException("No exception on small-order point");
+        });
+        Assertions.assertEquals("Failed to generate secret", thrown.getMessage());
     }
 
     private void runNonCanonicalTest() throws Exception {