From 452d594f21c5fea1a082d47bbfe487d5ada2e7a3 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 26 Mar 2024 10:12:55 +0100 Subject: [PATCH] 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..242724c604096c 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)) {