Skip to content

Commit 5900ebe

Browse files
danbevMylesBorins
authored andcommitted
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 <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Sam Roberts <[email protected]>
1 parent 9ca67e0 commit 5900ebe

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/node_crypto.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ static X509_NAME *cnnic_ev_name =
120120

121121
static Mutex* mutexes;
122122

123-
const char* const root_certs[] = {
123+
static const char* const root_certs[] = {
124124
#include "node_root_certs.h" // NOLINT(build/include_order)
125125
};
126126

127-
std::string extra_root_certs_file; // NOLINT(runtime/string)
127+
static std::string extra_root_certs_file; // NOLINT(runtime/string)
128128

129-
X509_STORE* root_cert_store;
129+
static X509_STORE* root_cert_store;
130130

131131
// Just to generate static methods
132132
template class SSLWrap<TLSWrap>;

src/node_crypto.h

-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ enum CheckResult {
6363

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

66-
extern X509_STORE* root_cert_store;
67-
6866
extern void UseExtraCaCerts(const std::string& file);
6967

7068
// Forward declaration

0 commit comments

Comments
 (0)