crypto: add OPENSSL_IS_BORINGSSL guard

codebytere · codebytere · commit 161b84cb46e6 · 2021-06-29T14:09:48.000+02:00
PR-URL: nodejs/node#39138 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/src/node.cc b/src/node.cc
@@ -1030,7 +1030,7 @@ InitializationResult InitializeOncePerProcess(
   }
 
   if (init_flags & kInitOpenSSL) {
-#if HAVE_OPENSSL
+#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)
     {
       std::string extra_ca_certs;
       if (credentials::SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs))
@@ -1091,7 +1091,7 @@ InitializationResult InitializeOncePerProcess(
   // V8 on Windows doesn't have a good source of entropy. Seed it from
   // OpenSSL's pool.
   V8::SetEntropySource(crypto::EntropySource);
-#endif  // HAVE_OPENSSL
+#endif  // HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)
 }
   per_process::v8_platform.Initialize(
       static_cast<int>(per_process::cli_options->v8_thread_pool_size));

Original file line number	Diff line number	Diff line change
`@@ -1030,7 +1030,7 @@ InitializationResult InitializeOncePerProcess(`
`1030`	`1030`	`}`
`1031`	`1031`
`1032`	`1032`	`if (init_flags & kInitOpenSSL) {`
`1033`		`-#if HAVE_OPENSSL`
	`1033`	`+#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)`
`1034`	`1034`	`{`
`1035`	`1035`	`std::string extra_ca_certs;`
`1036`	`1036`	`if (credentials::SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs))`
`@@ -1091,7 +1091,7 @@ InitializationResult InitializeOncePerProcess(`
`1091`	`1091`	`// V8 on Windows doesn't have a good source of entropy. Seed it from`
`1092`	`1092`	`// OpenSSL's pool.`
`1093`	`1093`	`V8::SetEntropySource(crypto::EntropySource);`
`1094`		`-#endif // HAVE_OPENSSL`
	`1094`	`+#endif // HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)`
`1095`	`1095`	`}`
`1096`	`1096`	`per_process::v8_platform.Initialize(`
`1097`	`1097`	`static_cast<int>(per_process::cli_options->v8_thread_pool_size));`