Skip to content

src: fix CAs missing from secure contexts #32315

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
ebickle wants to merge 4 commits into from
Closed

src: fix CAs missing from secure contexts #32315

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b0f50b
src: fix CAs missing from secure contexts
ebickle Mar 17, 2020
d6b075d
src: fix CAs missing from secure contexts
ebickle Mar 17, 2020
6743db2
Merge branch 'fix/missing-rootcertificates-2' of https://github.com/e…
ebickle Apr 8, 2020
7c337f7
src: improve code formatting of node_crypto.cc
ebickle Apr 8, 2020
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
Prev Previous commit
src: improve code formatting of node_crypto.cc 
Removed extraneous braces and superfluous scope comments.
  • Loading branch information
@ebickle
ebickle committed Apr 8, 2020
commit 7c337f74f227b5b97e71489b0027f0b590e2027a
5 changes: 1 addition & 4 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,9 +1004,8 @@ static X509_STORE* NewRootCertStore() {
X509_STORE_set_default_paths(store);
} else {
Mutex::ScopedLock lock(root_certs_vector_mutex);
for (X509* cert : root_certs_vector) {
for (X509* cert : root_certs_vector)
X509_STORE_add_cert(store, cert);
}
}

return store;
Expand Down Expand Up @@ -1085,7 +1084,6 @@ static unsigned long AddRootCertsFromFile( // NOLINT(runtime/int)
if (!bio)
return ERR_get_error();

// Scope for root_certs_vector lock
{
Mutex::ScopedLock lock(root_certs_vector_mutex);
while (X509* x509 =
Expand Down Expand Up @@ -6643,7 +6641,6 @@ void GetRootCertificates(const FunctionCallbackInfo<Value>& args) {

std::vector<Local<Value>> result;

// Scope for root_certs_vector lock
{
Mutex::ScopedLock lock(root_certs_vector_mutex);

Expand Down