Commit aeea13b
crypto: Use system CAs instead of using bundled ones
NodeJS can already use an external, shared OpenSSL library. This
library knows where to look for OS managed certificates. Allow
a compile-time option to use this CA store by default instead of
using bundled certificates.
In case when using bundled OpenSSL, the paths are also valid for
majority of Linux systems without additional intervention. If
this is not set, we can use SSL_CERT_DIR to point it to correct
location.
Fixes: #3159
PR-URL: #8334
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>1 parent ac2b059 commit aeea13b
2 files changed
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -144,6 +144,11 @@ parser.add_option('--openssl-fips', | |||
| 144 | 144 | dest='openssl_fips', | |
| 145 | 145 | help='Build OpenSSL using FIPS canister .o file in supplied folder') | |
| 146 | 146 | ||
| 147 | + parser.add_option('--openssl-use-def-ca-store', | ||
| 148 | + action='store_true', | ||
| 149 | + dest='use_openssl_ca_store', | ||
| 150 | + help='Use OpenSSL supplied CA store instead of compiled-in Mozilla CA copy.') | ||
| 151 | + | ||
| 147 | 152 | shared_optgroup.add_option('--shared-http-parser', | |
| 148 | 153 | action='store_true', | |
| 149 | 154 | dest='shared_http_parser', | |
@@ -940,6 +945,8 @@ def configure_openssl(o): | |||
| 940 | 945 | o['variables']['node_use_openssl'] = b(not options.without_ssl) | |
| 941 | 946 | o['variables']['node_shared_openssl'] = b(options.shared_openssl) | |
| 942 | 947 | o['variables']['openssl_no_asm'] = 1 if options.openssl_no_asm else 0 | |
| 948 | + if options.use_openssl_ca_store: | ||
| 949 | + o['defines'] += ['NODE_OPENSSL_CERT_STORE'] | ||
| 943 | 950 | if options.openssl_fips: | |
| 944 | 951 | o['variables']['openssl_fips'] = options.openssl_fips | |
| 945 | 952 | fips_dir = os.path.join(root_dir, 'deps', 'openssl', 'fips') | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -707,10 +707,14 @@ static X509_STORE* NewRootCertStore() { | |||
| 707 | 707 | } | |
| 708 | 708 | ||
| 709 | 709 | X509_STORE* store = X509_STORE_new(); | |
| 710 | + #if defined(NODE_OPENSSL_CERT_STORE) | ||
| 711 | + X509_STORE_set_default_paths(store); | ||
| 712 | + #else | ||
| 710 | 713 | for (X509 *cert : root_certs_vector) { | |
| 711 | 714 | X509_up_ref(cert); | |
| 712 | 715 | X509_STORE_add_cert(store, cert); | |
| 713 | 716 | } | |
| 717 | + #endif | ||
| 714 | 718 | ||
| 715 | 719 | return store; | |
| 716 | 720 | } | |
0 commit comments