From 8904a61acfe6afd598b5a175d289219e41f2bf5f Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 26 Mar 2024 10:12:55 +0100 Subject: [PATCH 1/3] crypto: enable NODE_EXTRA_CA_CERTS with BoringSSL --- src/node.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/node.cc b/src/node.cc index 07a91f485502b8..69d5c9d3efa3c7 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1083,7 +1083,8 @@ InitializeOncePerProcessInternal(const std::vector& args, } if (!(flags & ProcessInitializationFlags::kNoInitOpenSSL)) { -#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL) +#if HAVE_OPENSSL +#if !defined(OPENSSL_IS_BORINGSSL) auto GetOpenSSLErrorString = []() -> std::string { std::string ret; ERR_print_errors_cb( @@ -1183,13 +1184,13 @@ InitializeOncePerProcessInternal(const std::vector& args, CHECK(crypto::CSPRNG(buffer, length).is_ok()); return true; }); - +#endif // defined(OPENSSL_IS_BORINGSSL) { std::string extra_ca_certs; if (credentials::SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs)) crypto::UseExtraCaCerts(extra_ca_certs); } -#endif // HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL) +#endif // HAVE_OPENSSL } if (!(flags & ProcessInitializationFlags::kNoInitializeNodeV8Platform)) { From eaa72890ed4c2c72652df3160d74eb79eb44f5af Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 26 Mar 2024 17:15:29 +0100 Subject: [PATCH 2/3] Update src/node.cc Co-authored-by: Yagiz Nizipli --- src/node.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node.cc b/src/node.cc index 69d5c9d3efa3c7..03aad1ae1036d5 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1084,7 +1084,7 @@ InitializeOncePerProcessInternal(const std::vector& args, if (!(flags & ProcessInitializationFlags::kNoInitOpenSSL)) { #if HAVE_OPENSSL -#if !defined(OPENSSL_IS_BORINGSSL) +#ifndef OPENSSL_IS_BORINGSSL auto GetOpenSSLErrorString = []() -> std::string { std::string ret; ERR_print_errors_cb( From 82b82e8b79487f336b6b1e8b958933b9092f3042 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 27 Mar 2024 11:06:52 +0100 Subject: [PATCH 3/3] Update src/node.cc Co-authored-by: Luigi Pinca --- src/node.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node.cc b/src/node.cc index 03aad1ae1036d5..cad2f21756622a 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1184,7 +1184,7 @@ InitializeOncePerProcessInternal(const std::vector& args, CHECK(crypto::CSPRNG(buffer, length).is_ok()); return true; }); -#endif // defined(OPENSSL_IS_BORINGSSL) +#endif // !defined(OPENSSL_IS_BORINGSSL) { std::string extra_ca_certs; if (credentials::SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs))