crypto: enable NODE_EXTRA_CA_CERTS with BoringSSL

codebytere · aduh95 · commit 61e1ac0b8c9a · 2024-04-29T22:46:21.000+02:00
PR-URL: #52217 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/src/node.cc b/src/node.cc
@@ -1084,7 +1084,8 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
   }
 
   if (!(flags & ProcessInitializationFlags::kNoInitOpenSSL)) {
-#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)
+#if HAVE_OPENSSL
+#ifndef OPENSSL_IS_BORINGSSL
     auto GetOpenSSLErrorString = []() -> std::string {
       std::string ret;
       ERR_print_errors_cb(
@@ -1184,13 +1185,13 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& 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)) {

Original file line number	Diff line number	Diff line change
`@@ -1084,7 +1084,8 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,`
`1084`	`1084`	`}`
`1085`	`1085`
`1086`	`1086`	`if (!(flags & ProcessInitializationFlags::kNoInitOpenSSL)) {`
`1087`		`-#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)`
	`1087`	`+#if HAVE_OPENSSL`
	`1088`	`+#ifndef OPENSSL_IS_BORINGSSL`
`1088`	`1089`	`auto GetOpenSSLErrorString = []() -> std::string {`
`1089`	`1090`	`std::string ret;`
`1090`	`1091`	`ERR_print_errors_cb(`
`@@ -1184,13 +1185,13 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,`
`1184`	`1185`	`CHECK(crypto::CSPRNG(buffer, length).is_ok());`
`1185`	`1186`	`return true;`
`1186`	`1187`	`});`
`1187`		`-`
	`1188`	`+#endif // !defined(OPENSSL_IS_BORINGSSL)`
`1188`	`1189`	`{`
`1189`	`1190`	`std::string extra_ca_certs;`
`1190`	`1191`	`if (credentials::SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs))`
`1191`	`1192`	`crypto::UseExtraCaCerts(extra_ca_certs);`
`1192`	`1193`	`}`
`1193`		`-#endif // HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)`
	`1194`	`+#endif // HAVE_OPENSSL`
`1194`	`1195`	`}`
`1195`	`1196`
`1196`	`1197`	`if (!(flags & ProcessInitializationFlags::kNoInitializeNodeV8Platform)) {`