Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypto: enable NODE_EXTRA_CA_CERTS with BoringSSL #52217

Merged
merged 3 commits into from
Apr 11, 2024
Merged

crypto: enable NODE_EXTRA_CA_CERTS with BoringSSL #52217

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8904a61
crypto: enable NODE_EXTRA_CA_CERTS with BoringSSL
codebytere Mar 26, 2024
eaa7289
Update src/node.cc
codebytere Mar 26, 2024
82b82e8
Update src/node.cc
codebytere Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,8 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
}

if (!(flags & ProcessInitializationFlags::kNoInitOpenSSL)) {
#if HAVE_OPENSSL && !defined(OPENSSL_IS_BORINGSSL)
#if HAVE_OPENSSL
#if !defined(OPENSSL_IS_BORINGSSL)
codebytere marked this conversation as resolved.
Show resolved Hide resolved
auto GetOpenSSLErrorString = []() -> std::string {
std::string ret;
ERR_print_errors_cb(
Expand Down Expand Up @@ -1183,13 +1184,13 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
CHECK(crypto::CSPRNG(buffer, length).is_ok());
return true;
});

#endif // defined(OPENSSL_IS_BORINGSSL)
codebytere marked this conversation as resolved.
Show resolved Hide resolved
{
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)) {
Expand Down