fixup! crypto: add FIPS indicator diagnostics channel

panva · Aug 29, 2026 · Aug 29, 2026 · Aug 29, 2026 · Aug 29, 2026 · Aug 29, 2026
commit 077a0472dc913da34acd43162049cf8dd2a77457
diff --git a/doc/api/cli.md b/doc/api/cli.md
@@ -4562,6 +4562,7 @@ node --stack-trace-limit=12 -p -e "Error.stackTraceLimit" # prints 12
 [V8 Inspector integration for Node.js]: debugger.md#v8-inspector-integration-for-nodejs
 [V8 JavaScript code coverage]: https://v8project.blogspot.com/2017/12/javascript-code-coverage.html
 [`"type"`]: packages.md#type
+[`'crypto.fips.indicator'`]: diagnostics_channel.md#event-cryptofipsindicator
 [`--allow-addons`]: #--allow-addons
 [`--allow-child-process`]: #--allow-child-process
 [`--allow-fs-read`]: #--allow-fs-read
@@ -4575,7 +4576,6 @@ node --stack-trace-limit=12 -p -e "Error.stackTraceLimit" # prints 12
 [`--diagnostic-dir`]: #--diagnostic-dirdirectory
 [`--disable-sigusr1`]: #--disable-sigusr1
 [`--enable-fips`]: #--enable-fips
-[`'crypto.fips.indicator'`]: diagnostics_channel.md#event-cryptofipsindicator
 [`--env-file-if-exists`]: #--env-file-if-existsfile
 [`--env-file`]: #--env-filefile
 [`--experimental-sea-config`]: single-executable-applications.md#1-generating-single-executable-preparation-blobs

diff --git a/doc/api/crypto.md b/doc/api/crypto.md
@@ -7620,8 +7620,8 @@ See the [list of SSL OP Flags][] for details.
 [XTS mode]: #xts-mode
 [`'crypto.fips.indicator'`]: diagnostics_channel.md#event-cryptofipsindicator
 [`--allow-openssl-store`]: cli.md#--allow-openssl-store
-[`--enable-fips`]: cli.md#--enable-fips
 [`--enable-fips-indicator-events`]: cli.md#--enable-fips-indicator-events
+[`--enable-fips`]: cli.md#--enable-fips
 [`--force-fips`]: cli.md#--force-fips
 [`--openssl-config`]: cli.md#--openssl-configfile
 [`--openssl-shared-config`]: cli.md#--openssl-shared-config

diff --git a/src/node_options.cc b/src/node_options.cc
@@ -9,7 +9,7 @@
 #include "node_sea.h"
 #include "uv.h"
 #if HAVE_OPENSSL
-#include "openssl/opensslv.h"
+#include "ncrypto.h"  // Defines OPENSSL_VERSION_PREREQ for BoringSSL.
 #include "quic/guard.h"
 #endif
 

diff --git a/test/parallel/test-diagnostics-channel-crypto-fips-indicator.js b/test/parallel/test-diagnostics-channel-crypto-fips-indicator.js
@@ -1,14 +1,13 @@
 'use strict';
 
-// Flags: --enable-fips-indicator-events
-
 const common = require('../common');
 
 if (!common.hasCrypto) {
   common.skip('missing crypto');
 }
 
 const assert = require('node:assert');
+const { spawnSync } = require('node:child_process');
 const diagnosticsChannel = require('node:diagnostics_channel');
 const { once } = require('node:events');
 const { Worker } = require('node:worker_threads');
@@ -26,6 +25,15 @@ if (!hasOpenSSL(3, 4)) {
   common.skip('OpenSSL 3.4 or later is required');
 } else if (!hasFIPS(3, 4)) {
   common.skip('an active OpenSSL 3.4+ FIPS provider is required');
+} else if (!process.execArgv.includes('--enable-fips-indicator-events')) {
+  const child = spawnSync(
+    process.execPath,
+    ['--enable-fips-indicator-events', __filename],
+    { encoding: 'utf8' });
+  assert.strictEqual(
+    child.status,
+    0,
+    `stdout: ${child.stdout}\nstderr: ${child.stderr}`);
 } else {
   run().then(common.mustCall());
 }