diff options
| -rwxr-xr-x | configure.py | 6 | ||||
| -rw-r--r-- | node.gypi | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.py b/configure.py index 90630f7bd0..8cb4c58c21 100755 --- a/configure.py +++ b/configure.py @@ -173,6 +173,11 @@ parser.add_option('--openssl-fips', dest='openssl_fips', help='Build OpenSSL using FIPS canister .o file in supplied folder') +parser.add_option('--openssl-is-fips', + action='store_true', + dest='openssl_is_fips', + help='specifies that the OpenSSL library is FIPS compatible') + parser.add_option('--openssl-use-def-ca-store', action='store_true', dest='use_openssl_ca_store', @@ -1187,6 +1192,7 @@ def configure_openssl(o): variables = o['variables'] variables['node_use_openssl'] = b(not options.without_ssl) variables['node_shared_openssl'] = b(options.shared_openssl) + variables['openssl_is_fips'] = b(options.openssl_is_fips) variables['openssl_fips'] = '' if options.openssl_no_asm: @@ -315,7 +315,7 @@ [ 'node_use_openssl=="true"', { 'defines': [ 'HAVE_OPENSSL=1' ], 'conditions': [ - ['openssl_fips != ""', { + ['openssl_fips != "" or openssl_is_fips=="true"', { 'defines': [ 'NODE_FIPS_MODE' ], }], [ 'node_shared_openssl=="false"', { |