Permalink
Browse files

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 jasnell committed May 24, 2017
1 parent 4030aed commit 7b97f073401a95bfa840b158fbbcaf0daf772e15
Showing with 3 additions and 5 deletions.
  1. +3 −3 src/node_crypto.cc
  2. +0 −2 src/node_crypto.h
View
@@ -146,13 +146,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 void SSLWrap<TLSWrap>::AddMethods(Environment* env,
View
@@ -84,8 +84,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);
class SecureContext : public BaseObject {

0 comments on commit 7b97f07

Please sign in to comment.