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.

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

v6.11.3-proposal #14852

Merged
merged 153 commits into from
Sep 5, 2017
Merged
Changes from 1 commit
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
9ca67e0
src: make root_cert_vector function scoped
danbev May 2, 2017
5900ebe
crypto: remove root_cert_store from node_crypto.h
danbev May 24, 2017
67ce52c
deps: backport rehash strings after deserialization
hashseed Jul 20, 2017
73c720d
doc: change `child` to `subprocess`
Trott Aug 1, 2017
5ba65f2
doc: add entry for subprocess.killed property
Trott Aug 3, 2017
e79c054
zlib: fix crash when initializing failed
addaleax Aug 7, 2017
a7b9450
test: add common.noop, default for common.mustCall()
jasnell Mar 24, 2017
7bb200f
tools: add rule prefering common.mustNotCall()
jasnell Mar 24, 2017
f578c9b
test: add mustCallAtLeast
refack May 9, 2017
a1cef1f
test: harden test-dgram-bind-shared-ports
refack May 18, 2017
6518932
dns: fix `resolve` failed starts without network
XadillaX Aug 10, 2017
f9e4279
src: supply missing comments for CLI options
sam-github Apr 5, 2017
547e74b
src: use option parser for expose_internals
sam-github Apr 5, 2017
202bfcc
test: mark test-fs-read-buffer-to-string-fail as flaky
Jeyanthinath Jul 26, 2017
c2a0a93
test: increase coverage for path.parse
tniessen Jul 24, 2017
eefd322
path: fix win32 volume-relative paths
TimothyGu Jul 24, 2017
e82a914
path: remove unnecessary string copies
tniessen Jul 23, 2017
74d5cba
tools: add missing #include "unicode/putil.h"
srl295 Mar 27, 2017
e8438c1
timers: do not use user object call/apply
Trott May 11, 2017
7fed989
deps: cherry-pick f5fad6d from upstream v8
danbev May 2, 2017
403c45f
src: only call FatalException if not verbose
danbev May 3, 2017
efc0f64
build: reduce one level of spawning in node_gyp
refack Apr 25, 2017
8b161e0
test: check number of message events
Trott May 20, 2017
4a3e089
test: confirm callback is invoked in fs test
Trott May 20, 2017
e15e2e7
test: check noop function invocations
Trott May 21, 2017
7a5248d
test: simplify assert usage in test-stream2-basic
Trott May 21, 2017
b7c7112
test: move stream2 test from pummel to parallel
Trott May 21, 2017
c7025de
build: support dtrace on ARM
bradleythughes Mar 27, 2017
b793fc6
test: replace `indexOf` with `includes`
thelostone-mc May 25, 2017
3808e37
test: use mustNotCall() in test-stream2-objects
Trott May 26, 2017
371b648
test: use mustCall() in test-readline-interface
Trott May 27, 2017
55c96cf
test: refactor test-net-server-bind
Trott May 29, 2017
08f7cca
test: add documentation for common.mustNotCall()
Trott Jun 1, 2017
91fb0cb
test: refactor test-dgram-oob-buffer
Trott Jun 3, 2017
543d2de
test: check callback not invoked on lookup error
Trott Jun 4, 2017
3bdf7bf
test: refactor domain tests
Trott Jun 5, 2017
2f19dcd
test: refactor test-fs-read-*
Trott Jun 6, 2017
135e1e3
src: merge `fn_name` in NODE_SET_PROTOTYPE_METHOD
XadillaX Jun 8, 2017
406b3c0
test: use mustNotCall in test-http-eof-on-connect
Trott Jun 9, 2017
9356e96
test: add mustCall() to child-process test
Trott Jun 11, 2017
5e9b203
test: use mustNotCall() in test-fs-watch
Trott Jun 10, 2017
389f294
test: make test-http(s)-set-timeout-server alike
jklepatch Jun 12, 2017
842b84c
test: refactor test-http-set-timeout-server
Trott Jun 19, 2017
6731d1b
test: remove needless RegExp flags
vsemozhetbyt Jun 15, 2017
5a9d7b3
test: use string instead of RegExp in split()
vsemozhetbyt Jun 16, 2017
87906d2
doc: add missing zlib link to stream API docs
Rob--W Jun 21, 2017
1fb19ac
test: remove unnecessary Buffer import
swinston1000 Jun 21, 2017
0abc82d
test: remove require('buffer') on 6 fs test files
sallen450 Jun 21, 2017
6d02bf4
test: remove require('buffer') from 4 buffer tests
OriLev Jun 21, 2017
fff0b83
test: remove `require('buffer')` from 4 test files
leizongmin Jun 21, 2017
cd962e6
test: remove unnecessary require('buffer').Buffer
lenakaplan Jun 21, 2017
8ba7843
test: remove `require('buffer')` from 4 test files
XadillaX Jun 21, 2017
a04d4ea
build: clean up config_fips.gypi
danbev Jun 21, 2017
fd6bbc0
test: make http(s)-set-timeout-server more similar
jklepatch Jun 20, 2017
676a94e
test: refactor test-tls-env-extra-ca
Trott Jun 23, 2017
d3c85a4
test: refactor test-tls-invoked-queued
Trott Jun 23, 2017
beca25a
test: skip fips tests using OpenSSL config file
danbev Jun 18, 2017
7142c92
doc: fixed formatting issue in cli docs
Jun 20, 2017
dc3d295
test: remove unneeded HandleScope usage
ezequielgarcia Jun 19, 2017
c34a747
doc: fix mistake in path.relative
tniessen Jun 25, 2017
b03430b
doc: add gireeshpunathil to collaborators
gireeshpunathil Jun 28, 2017
7648cca
doc: add @nodejs/documentation to CC table
vsemozhetbyt Jun 27, 2017
70901b2
tools: remove comment in eslint rule
danbev Jun 27, 2017
74945dd
test: refactor test-cluster-basic
Trott Jun 25, 2017
db4faba
doc: note that fs.futimes only works on AIX >7.1
gibfahn Jun 13, 2017
35f9111
src: add missing new line to printed message
TimothyGu Jun 26, 2017
bd8574c
test: refactor test-child-process-send-type-error
Trott Jun 25, 2017
51364b7
src: move crypto_bio/clienthello to crypto ns
danbev Jun 28, 2017
81edf59
lib: fix typos
BridgeAR Jun 17, 2017
0bcbcca
test: refactor test-fs-watchfile
Trott Jun 16, 2017
2bc7c3a
child_process: fix handleless NODE_HANDLE handling
santigimeno May 25, 2017
2eb926b
test: remove undef NDEBUG from at-exit addons test
danbev Jun 30, 2017
49e7866
test: replace indexOf with includes and startsWith
Jun 21, 2017
f1d91ce
doc: fix example in child_process.md
rus0000 Jun 16, 2017
ac851c4
test: refactor test-http-invalidheaderfield
Trott Jun 30, 2017
3b3d47c
doc: add CTC members to Collaborators list
Trott May 29, 2017
346f199
test: refactor test-http(s)-set-timeout-server
aqrln Jun 26, 2017
f3c0b8c
test,fs: delay unlink in test-regress-GH-4027.js
jaimecbernardo Jun 30, 2017
c5c65c8
test: fix require nits in some test-tls-* tests
vsemozhetbyt Jun 30, 2017
7f6f1c2
doc, util, console: clarify ambiguous docs
nattelog Jul 1, 2017
01d82d8
tools: use no-use-before-define ESLint rule
vsemozhetbyt Jul 1, 2017
ae7eeff
test: fix flaky test-https-set-timeout-server
Trott Jul 8, 2017
4963228
test: fix flaky http(s)-set-server-timeout tests
Trott Jul 20, 2017
bccd2f5
v8: handle proxy objects in MakeMirror(), v1
bnoordhuis Jul 24, 2017
9e2d85e
v8: handle proxy objects in MakeMirror(), v2
bnoordhuis Jul 24, 2017
d5bf137
v8: fix RegExp nits in v8_prof_polyfill.js
vsemozhetbyt Jun 15, 2017
d34bc78
tools: update to ESLint 4.1.0
Trott Jun 24, 2017
8f664e5
tools: add script to update ESLint
Trott Jun 24, 2017
509205f
tools: update to ESLint 4.1.1
Trott Jun 27, 2017
46e4a02
test: skip test-fs-readdir-ucs2 if no support
Trott Jul 1, 2017
8b7c4fc
tools: remove align-multiline-assignment lint rule
Trott Jul 5, 2017
f20ed49
lib: use consistent indentation for ternaries
Trott Jul 5, 2017
4dabeee
lib: remove excess indentation
Trott Jul 5, 2017
0cacd6c
lib: normalize indentation in parentheses
Trott Jul 7, 2017
963ea0e
lib: update indentation of ternaries
Trott Jul 15, 2017
b7b38bd
test: adjust indentation for stricter linting
Trott Jul 25, 2017
a3cd733
doc: fix indentation issues in sample code
Trott Jun 27, 2017
62de339
tools: remove legacy indentation linting
Trott Aug 15, 2017
4d3b76d
src: remove GTEST_DONT_DEFINE_ASSERT_EQ in util.h
danbev Apr 25, 2017
1633f8b
test: simplify test skipping
vsemozhetbyt Jun 30, 2017
2a1a93d
build,windows: implement PEP514 python detection
refack Jun 24, 2017
c2090a0
build,windows: restore DISTTYPEDIR
refack Jun 28, 2017
325813e
build,win: fix python detection script
jasongin Jul 31, 2017
2af2165
tools: generate template literal for addon tests
Trott Jul 5, 2017
c307f03
doc,test: fs - reserved characters under win32
XadillaX Jul 4, 2017
8dbf827
doc: fix mistake in http.md
galeo Jul 7, 2017
9599faa
doc: note 'resize' event conditions on Windows
Dean-Coakley Jun 9, 2017
49d3dee
doc: correct stream Duplex allowHalfOpen doc
Trott Jul 7, 2017
40a61e1
test: add get/set effective uid/gid tests
evanlucas Jul 5, 2017
688e5ed
test: remove common.noop
Trott May 4, 2017
c5adb5f
tools: update ESLint to 4.2.0
Trott Aug 16, 2017
7d851e3
tools: update package.json `engine` field
strugee Jul 12, 2017
b0286ac
doc: update umask for clarity
jsumners Jul 11, 2017
95be08e
benchmark: fix typo in inspect-proxy
vsemozhetbyt Jul 14, 2017
1e40390
test: fix flaky test-net-can-reset-timeout
Trott Jul 15, 2017
a168361
test: check complete error message
fraserxu Jul 16, 2017
8b945e7
test: use regular expression to match error msg
Amunu Jul 16, 2017
94ff591
test: use regluar expression in vm test
AkiraXue Jul 16, 2017
b9b343c
test: use regexp to confir error message
bangwu Jul 16, 2017
77506e4
test: simplify string concatenation
jiangplus Jul 16, 2017
a696e2e
test: use template literal for string concat
whatwewant Jul 16, 2017
bbe3288
test: use regex error checks in test-util-format
superwoods Jul 16, 2017
8b69504
doc: move LTS README link to increase prominence
gibfahn Jul 16, 2017
f8b60e4
gyp: implement LD/LDXX for ninja and FIPS
sam-github Jul 13, 2017
3047cf1
test: check error with regex in test-signal-safety
shaman2009 Jul 16, 2017
7a8eddf
test: use regex error check in test-crypto-random
f48vj Jul 16, 2017
d7afa17
test: fix error handling test-http-full-response
Trott Jul 15, 2017
c4f21b3
test: replace concatenation with template literals
csvwolf Jul 16, 2017
d6ab8e2
doc,stream: _transform happens one at a time
mcollina Jul 17, 2017
226ef71
doc: replace dead link in v8 module
drboyer Jul 19, 2017
1d5ba9c
docs: add note about fs.rmdir()
Oleksandr-Kushchak-i2 Jul 17, 2017
1a7e872
build,tools: do not force codesign prefix
evanlucas Jul 12, 2017
977fdce
build: codesign tarball binary on macOS
evanlucas Jul 12, 2017
bbd1c79
test: use path.join for long path concatenation
jankjn Jul 16, 2017
013155d
doc: add XadillaX to collaborators
XadillaX Jul 20, 2017
11ed4c2
test: replace string concatenation with template
Jul 16, 2017
7f7a070
test: replace concatenation with template literals
leizongmin Jul 16, 2017
ad2431c
doc: describe labelling process for backports
addaleax Apr 15, 2017
987332a
deps: cherry-pick 18ea996 from c-ares upstream
addaleax Jul 15, 2017
c013c54
doc: update experimental status to reflect use
jasnell Apr 28, 2017
3ba55d8
test: replace concatenation with template literal
HSUCHING Jul 16, 2017
6fd3dd2
test: replace concatenation with template literal
rockcoder23 Jul 16, 2017
95a95cc
test: fix flaky test-force-repl
Trott Jul 23, 2017
1a88c3e
test: improve error logging for inspector test
Trott Jul 27, 2017
dbb6520
buffer: remove a wrongly added attribute specifier
hujiajie Jul 24, 2017
39f6240
linkedlist: correct grammar in comments
alexbostock Jul 30, 2017
e5375a9
test: add check on an addon that does not register
ezequielgarcia Jun 28, 2017
4b9de44
test: refactor test-vm-new-script-new-context
Trott Jul 29, 2017
2ce80d9
test: refactor test-domain-abort-on-uncaught
Trott Jul 30, 2017
fe6735c
src: use existing strings over creating new ones
addaleax Aug 2, 2017
438a642
doc: add gabrielschulhof to collaborators
Aug 8, 2017
31f572c
tools: update to ESLint 4.3.0
Trott Jul 21, 2017
dbce2ec
2017-09-05, Version 6.11.3 'Boron' (LTS)
MylesBorins Aug 15, 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
crypto: remove root_cert_store from node_crypto.h
root_cert_store is defined as extern in node_crypto.h but only used in
node_crypto.cc. It is then set using SSL_CTX_set_cert_store. The only
usages of SSL_CTX_get_cert_store are in node_crypto.cc which would all
be accessing the same X509_STORE through the root_cert_store pointer as
far as I can tell. Am I missing something here?

This commit suggests removing it from the header and making it static
in node_crypto.cc.

PR-URL: #13194
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
  • Loading branch information
danbev authored and MylesBorins committed Aug 12, 2017
commit 5900ebe9e4f6a6e761d807430f2856e94b2df6ac
6 changes: 3 additions & 3 deletions src/node_crypto.cc
Original file line number Diff line number Diff line change
@@ -120,13 +120,13 @@ static X509_NAME *cnnic_ev_name =

static Mutex* mutexes;

const char* const root_certs[] = {
static const char* const root_certs[] = {
#include "node_root_certs.h" // NOLINT(build/include_order)
};

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

X509_STORE* root_cert_store;
static X509_STORE* root_cert_store;

// Just to generate static methods
template class SSLWrap<TLSWrap>;
2 changes: 0 additions & 2 deletions src/node_crypto.h
Original file line number Diff line number Diff line change
@@ -63,8 +63,6 @@ enum CheckResult {

extern int VerifyCallback(int preverify_ok, X509_STORE_CTX* ctx);

extern X509_STORE* root_cert_store;

extern void UseExtraCaCerts(const std::string& file);

// Forward declaration