Skip to content

Revert "src: exclude node_root_certs when use-def-ca-store" #12391

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

Closed
danbev wants to merge 1 commit into from
Closed

Revert "src: exclude node_root_certs when use-def-ca-store" #12391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Revert "src: exclude node_root_certs when use-def-ca-store" 
This reverts commit be98f26.

The above commit prevented the functionality of --use-bundled-ca if
Node has been built using --openssl-use-def-ca-store, since there will
be no bundled ca included and no way to use them.

I only noticed this when trying to add // Flags: --use-bundled-ca to
test-tls-ccnic-whitelist.js to force it to use the bundled ca and allow
the test to pass.
  • Loading branch information
@danbev
danbev committed Apr 13, 2017
commit a2384f244eae78f925de445eed1848afe3ef053d
4 changes: 0 additions & 4 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,9 @@ static X509_NAME *cnnic_ev_name =

static Mutex* mutexes;

#if !defined(NODE_OPENSSL_CERT_STORE)
const char* const root_certs[] = {
#include "node_root_certs.h" // NOLINT(build/include_order)
};
#endif

std::string extra_root_certs_file; // NOLINT(runtime/string)

Expand Down Expand Up @@ -722,7 +720,6 @@ static int X509_up_ref(X509* cert) {


static X509_STORE* NewRootCertStore() {
#if !defined(NODE_OPENSSL_CERT_STORE)
if (root_certs_vector.empty()) {
for (size_t i = 0; i < arraysize(root_certs); i++) {
BIO* bp = NodeBIO::NewFixed(root_certs[i], strlen(root_certs[i]));
Expand All @@ -735,7 +732,6 @@ static X509_STORE* NewRootCertStore() {
root_certs_vector.push_back(x509);
}
}
#endif

X509_STORE* store = X509_STORE_new();
if (ssl_openssl_cert_store) {
Expand Down