Skip to content

(v6.x backport) src: use option parser for expose_internals #14483

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
sam-github wants to merge 17 commits into from
Closed

(v6.x backport) src: use option parser for expose_internals #14483

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ccc0ab7
net: support passing undefined to listen()
sam-github Jul 14, 2017
34c93e3
doc: prepare js code for eslint-plugin-markdown
vsemozhetbyt Apr 21, 2017
95e0879
doc: conform to rules for eslint-plugin-markdown
vsemozhetbyt Apr 21, 2017
8fef985
build, doc, tools: add eslint-plugin-markdown
vsemozhetbyt Jul 4, 2017
0d60a34
tools: remove no-useless-regex-char-class-escape
Trott Jan 1, 2017
81c2763
tools: fix indentation in required-modules.js
Trott Jun 18, 2017
446b04a
tools: apply stricter indentation rules to tools
Trott Jun 18, 2017
8648032
tools: fix error in custom ESLint rule
Trott Jun 19, 2017
97f5806
test: fix RegExp nits
vsemozhetbyt Jun 18, 2017
565c556
vm: fix displayErrors in runIn.. functions
laverdet May 18, 2017
8188a52
vm: fix race condition with timeout param
laverdet May 18, 2017
71e542c
http: describe parse err in debug output
sam-github May 24, 2017
65f8bfb
https: support rejectUnauthorized for unix sockets
cjihrig Jun 6, 2017
696f439
src: make root_cert_vector function scoped
danbev May 2, 2017
7b8fcf8
crypto: remove root_cert_store from node_crypto.h
danbev May 24, 2017
39c381c
src: supply missing comments for CLI options
sam-github Apr 5, 2017
b39075b
src: use option parser for expose_internals
sam-github Apr 5, 2017
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
Next Next commit
src: make root_cert_vector function scoped 
root_cert_vector currently has file scope and external linkage, but is
only used in the NewRootCertsStore function. If this is not required to
be externally linked perhaps it can be changed to be static and function
scoped instead.

PR-URL: #12788
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
  • Loading branch information
@danbev @sam-github
danbev authored and sam-github committed Jul 21, 2017
commit 696f4391d1af124f1ecf50f8aa6c597ace8b11fb
2 changes: 1 addition & 1 deletion src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ const char* const root_certs[] = {
std::string extra_root_certs_file; // NOLINT(runtime/string)

X509_STORE* root_cert_store;
std::vector<X509*> root_certs_vector;

// Just to generate static methods
template class SSLWrap<TLSWrap>;
Expand Down Expand Up @@ -710,6 +709,7 @@ static int X509_up_ref(X509* cert) {


static X509_STORE* NewRootCertStore() {
static std::vector<X509*> root_certs_vector;
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 Down