[TEMP] Temporary for debugging in CI with openssl 1.1.1

nodejs · Mar 6, 2025 · 2c83aa7 · 2c83aa7
1 parent defdb2f
commit 2c83aa7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/deps/ncrypto/ncrypto.cc b/deps/ncrypto/ncrypto.cc
@@ -235,9 +235,10 @@ bool setFipsEnabled(bool enable, CryptoErrorList* errors) {
   if (isFipsEnabled() == enable) return true;
   ClearErrorOnReturn clearErrorOnReturn(errors);
 #if OPENSSL_VERSION_MAJOR >= 3
-  return EVP_default_properties_enable_fips(nullptr, enable ? 1 : 0) == 1;
+  return EVP_default_properties_enable_fips(nullptr, enable ? 1 : 0) == 1 &&
+         EVP_default_properties_is_fips_enabled(nullptr);
 #else
-  return FIPS_mode_set(enable ? 1 : 0) == 1;
+  return FIPS_mode() == 0 ? FIPS_mode_set(enable ? 1 : 0) == 1 : true;
 #endif
 }
 

diff --git a/src/crypto/crypto_util.cc b/src/crypto/crypto_util.cc
@@ -86,7 +86,7 @@ bool ProcessFipsOptions() {
   if (per_process::cli_options->enable_fips_crypto ||
       per_process::cli_options->force_fips_crypto) {
     if (!ncrypto::testFipsEnabled()) return false;
-    return ncrypto::setFipsEnabled(true, nullptr) && ncrypto::isFipsEnabled();
+    return ncrypto::setFipsEnabled(true, nullptr);
   }
   return true;
 }

diff --git a/test/parallel/test-crypto-fips.js b/test/parallel/test-crypto-fips.js
@@ -49,7 +49,18 @@ function testHelper(stream, args, expectedOutput, cmd, env) {
     assert.notStrictEqual(response.length, 0);
     if (FIPS_ENABLED !== expectedOutput && FIPS_DISABLED !== expectedOutput) {
       // In the case of expected errors just look for a substring.
+try {
       assert.ok(response.includes(expectedOutput));
+} catch (err) {
+  console.log('-----------------------------');
+  console.log('Actual output:');
+  console.log(response);
+  console.log('-----------------------------');
+  console.log('Assertion error:');
+  console.log(err.stack);
+  console.log('-----------------------------');
+  throw err;
+}
     } else {
       const getFipsValue = Number(response);
       if (!Number.isNaN(getFipsValue))