Commit 47d040d
build: introduce --openssl-is-fips flag
This commit introduces a new configuration flag named
--openssl-is-fips which is intended to be used when linking against
an OpenSSL library that is FIPS compatible.
The motivation for this is that Red Hat Enterprise Linux 8 (RHEL8)
comes with OpenSSL 1.1.1 and includes FIPS support, and we would
like to be able to dynamically link against this version and also have
FIPS features enabled in node, like would be done when statically
linking and using the --openssl-fips flag.
The suggestion here is to introduce a new flag:
$ ./configure --help
...
--openssl-is-fips specifies that the shared OpenSSL version is FIPS
compatible
This flag could be used in combination with the shared-openssl flag:
$ ./configure --shared-openssl ---openssl-is-fips
This will enable FIPS support in node and the runtime flags will be
availalbe to enable FIPS (--enable-fips, --force-fips).
PR-URL: #25412
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>1 parent 0897504 commit 47d040d
2 files changed
Lines changed: 7 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -173,6 +173,11 @@ | |||
| 173 | 173 | dest='openssl_fips', | |
| 174 | 174 | help='Build OpenSSL using FIPS canister .o file in supplied folder') | |
| 175 | 175 | ||
| 176 | + parser.add_option('--openssl-is-fips', | ||
| 177 | + action='store_true', | ||
| 178 | + dest='openssl_is_fips', | ||
| 179 | + help='specifies that the OpenSSL library is FIPS compatible') | ||
| 180 | + | ||
| 176 | 181 | parser.add_option('--openssl-use-def-ca-store', | |
| 177 | 182 | action='store_true', | |
| 178 | 183 | dest='use_openssl_ca_store', | |
@@ -1190,6 +1195,7 @@ def configure_openssl(o): | |||
| 1190 | 1195 | variables = o['variables'] | |
| 1191 | 1196 | variables['node_use_openssl'] = b(not options.without_ssl) | |
| 1192 | 1197 | variables['node_shared_openssl'] = b(options.shared_openssl) | |
| 1198 | + variables['openssl_is_fips'] = b(options.openssl_is_fips) | ||
| 1193 | 1199 | variables['openssl_fips'] = '' | |
| 1194 | 1200 | ||
| 1195 | 1201 | if options.openssl_no_asm: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -319,7 +319,7 @@ | |||
| 319 | 319 | [ 'node_use_openssl=="true"', { | |
| 320 | 320 | 'defines': [ 'HAVE_OPENSSL=1' ], | |
| 321 | 321 | 'conditions': [ | |
| 322 | - ['openssl_fips != ""', { | ||
| 322 | + ['openssl_fips != "" or openssl_is_fips=="true"', { | ||
| 323 | 323 | 'defines': [ 'NODE_FIPS_MODE' ], | |
| 324 | 324 | }], | |
| 325 | 325 | [ 'node_shared_openssl=="false"', { | |
0 commit comments