Skip to content

test: add test-fs-read-buffer-to-string-fail as pass and flaky to all platforms #14495

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

test: add test-fs-read-buffer-to-string-fail as pass and flaky to all platforms #14495

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b80aedf
net: support passing undefined to listen()
sam-github Jul 14, 2017
02e0b1a
src: make root_cert_vector function scoped
danbev May 2, 2017
f4691bb
crypto: remove root_cert_store from node_crypto.h
danbev May 24, 2017
0b012a6
test: mark test-fs-read-buffer-to-string-fail as flaky
Jeyanthinath Jul 26, 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 @MylesBorins
danbev authored and MylesBorins committed Aug 1, 2017
commit f4691bb2f37661cfd481b46461c1a483b99f63b6
6 changes: 3 additions & 3 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down
2 changes: 0 additions & 2 deletions src/node_crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down