Disable EdDSA PWCT, block until self-tests finish

Author: WillChilds-Klein

build.gradle

@@ -269,7 +269,7 @@ task buildAwsLc {
 
                 if (allowFipsTestBreak) {
                     println "Building AWS-LC with hooks to break FIPS tests"
-                    args '-DFIPS_BREAK_TEST='
+                    args '-DFIPS_BREAK_TEST=TESTS'
                 }
 
                 if (isFipsSelfTestFailureSkipAbort) {

csrc/auto_free.h

@@ -79,7 +79,7 @@
         void releaseOwnership() { PTR_NAME(name) = NULL; }                                                             \
         void clear()                                                                                                   \
         {                                                                                                              \
-            CONCAT2(name, _free)(PTR_NAME(name));                                                                       \
+            CONCAT2(name, _free)(PTR_NAME(name));                                                                      \
             PTR_NAME(name) = NULL;                                                                                     \
         }                                                                                                              \
         name* operator->() { return *this; }                                                                           \

csrc/ed_gen.cpp

@@ -7,12 +7,12 @@
 
 using namespace AmazonCorrettoCryptoProvider;
 
-void generateEdKey(EVP_PKEY_auto& key)
+static void generateEdKey(EVP_PKEY_auto& key)
 {
     EVP_PKEY_CTX_auto ctx = EVP_PKEY_CTX_auto::from(EVP_PKEY_CTX_new_id(EVP_PKEY_ED25519, nullptr));
     CHECK_OPENSSL(ctx.isInitialized());
     CHECK_OPENSSL(EVP_PKEY_keygen_init(ctx) == 1);
-    CHECK_OPENSSL(EVP_PKEY_keygen(ctx, key.getAddressOfPtr()));
+    CHECK_OPENSSL(EVP_PKEY_keygen(ctx, key.getAddressOfPtr()) == 1);
 }
 
 JNIEXPORT jlong JNICALL Java_com_amazon_corretto_crypto_provider_EdGen_generateEvpEdKey(JNIEnv* pEnv, jclass)

csrc/fips_status.cpp

@@ -3,6 +3,7 @@
 #include <cstdio>
 #include <functional>
 #include <jni.h>
+#include <string.h>
 #include <vector>
 
 #include "string_vector.h"

tst/com/amazon/corretto/crypto/provider/test/FipsStatusTest.java

@@ -12,6 +12,7 @@
 import com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider;
 import com.amazon.corretto.crypto.provider.FipsStatusException;
 import com.amazon.corretto.crypto.provider.RuntimeCryptoException;
+import com.amazon.corretto.crypto.provider.SelfTestStatus;
 import java.security.KeyPairGenerator;
 import javax.crypto.KeyGenerator;
 import org.junit.jupiter.api.Test;
@@ -35,6 +36,7 @@ public class FipsStatusTest {
   public void givenAccpBuiltWithFips_whenAWS_LC_fips_failure_callback_expectException()
       throws Exception {
     if (provider.isFips() && provider.isFipsSelfTestFailureSkipAbort()) {
+      blockUntilSelfTestsRun();
       assertTrue(provider.isFipsStatusOk());
       assertEquals(0, provider.getFipsSelfTestFailures().size());
       assertNotNull(KeyGenerator.getInstance("AES", provider));
@@ -48,6 +50,7 @@ public void givenAccpBuiltWithFips_whenAWS_LC_fips_failure_callback_expectExcept
       // we need to flip the status back to OK so the rest of tests would work. In practice, once
       // the flag is set to false, it remains false.
       NativeTestHooks.resetFipsStatus();
+      assertTrue(provider.isFipsStatusOk());
     } else {
       assertThrows(UnsupportedOperationException.class, () -> provider.isFipsStatusOk());
       assertThrows(UnsupportedOperationException.class, () -> provider.getFipsSelfTestFailures());
@@ -72,21 +75,37 @@ private void testPwctBreakage(final String algo, String envVarValue) throws Exce
     }
     // Be sure to reset provider-global state!
     TestUtil.setEnv(PWCT_BREAKAGE_ENV_VAR, null);
+    assertNotNull(kpg.generateKeyPair());
     NativeTestHooks.resetFipsStatus();
     assertTrue(provider.isFipsStatusOk());
   }
 
   @Test
   public void testPwctBreakageSkipAbort() throws Exception {
+    blockUntilSelfTestsRun();
     assumeTrue(provider.isFips());
     assumeTrue(provider.isFipsSelfTestFailureSkipAbort());
     testPwctBreakage("RSA", "RSA_PWCT");
     testPwctBreakage("EC", "ECDSA_PWCT");
-    if (TestUtil.getJavaVersion() >= 15) {
-      testPwctBreakage("EdDSA", "EDDSA_PWCT");
-    }
+    // TODO: Re-enable this test when AWS-LC's EdDSA can fail keygen
+    // https://github.com/aws/aws-lc/pull/2256
+    // testPwctBreakage("EdDSA", "EDDSA_PWCT");
     if (provider.isExperimentalFips()) { // can be removed when AWS-LC-FIPS supports ML-DSA
       testPwctBreakage("ML-DSA", "MLDSA_PWCT");
     }
   }
+
+  // FIPS status won't be OK until the power-on self tests have run and passed, so provide a method
+  // that blocks until the tests have completed. Set a deadline to make terminal hang impossible.
+  private void blockUntilSelfTestsRun() throws Exception {
+    assertTrue(provider.isFips());
+    long timeout = 5 * 1000;
+    long deadline = System.currentTimeMillis() + timeout;
+    while (provider.getSelfTestStatus() == SelfTestStatus.NOT_RUN) {
+      Thread.sleep(100);
+      if (System.currentTimeMillis() > deadline) {
+        throw new RuntimeException("FIPS self tests timed out");
+      }
+    }
+  }
 }