Commit b8f4070
src: check node_extra_ca_certs after openssl cfg
I recently discovered that the custom NodeJS specific OpenSSL
config section in openssl.cnf would not be respected, if the
environment variable `NODE_EXTRA_CA_CERTS` was set.
This happens even if it contains an invalid value, i.e no actual
certs are read.
Someone suggested moving the checking of extra ca certs to after
the OpenSSL config is read, and this seems to work.
PR-URL: #48159
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>1 parent ed45142 commit b8f4070
1 file changed
Lines changed: 6 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -961,11 +961,6 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args, | |||
| 961 | 961 | return ret; | |
| 962 | 962 | }; | |
| 963 | 963 | ||
| 964 | - { | ||
| 965 | - std::string extra_ca_certs; | ||
| 966 | - if (credentials::SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs)) | ||
| 967 | - crypto::UseExtraCaCerts(extra_ca_certs); | ||
| 968 | - } | ||
| 969 | 964 | // In the case of FIPS builds we should make sure | |
| 970 | 965 | // the random source is properly initialized first. | |
| 971 | 966 | #if OPENSSL_VERSION_MAJOR >= 3 | |
@@ -1052,6 +1047,12 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args, | |||
| 1052 | 1047 | CHECK(crypto::CSPRNG(buffer, length).is_ok()); | |
| 1053 | 1048 | return true; | |
| 1054 | 1049 | }); | |
| 1050 | + | ||
| 1051 | + { | ||
| 1052 | + std::string extra_ca_certs; | ||
| 1053 | + if (credentials::SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs)) | ||
| 1054 | + crypto::UseExtraCaCerts(extra_ca_certs); | ||
| 1055 | + } | ||
| 1055 | 1056 | #endif // HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL) | |
| 1056 | 1057 | } | |
| 1057 | 1058 | ||
0 commit comments