squash: move NewRootCertStore to crypto_context.h

nodejs · Oct 18, 2020 · f7fd2ec · f7fd2ec
1 parent 0ab510b
commit f7fd2ec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/crypto/crypto_context.cc b/src/crypto/crypto_context.cc
@@ -187,7 +187,9 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx,
                                        issuer);
 }
 
-static X509_STORE* NewRootCertStore() {
+}  // namespace
+
+X509_STORE* NewRootCertStore() {
   static std::vector<X509*> root_certs_vector;
   static Mutex root_certs_vector_mutex;
   Mutex::ScopedLock lock(root_certs_vector_mutex);
@@ -228,7 +230,6 @@ static X509_STORE* NewRootCertStore() {
 
   return store;
 }
-}  // namespace
 
 void GetRootCertificates(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);

diff --git a/src/crypto/crypto_context.h b/src/crypto/crypto_context.h
@@ -21,6 +21,8 @@ void GetRootCertificates(
 void IsExtraRootCertsFileLoaded(
     const v8::FunctionCallbackInfo<v8::Value>& args);
 
+X509_STORE* NewRootCertStore();
+
 class SecureContext final : public BaseObject {
  public:
   ~SecureContext() override;

diff --git a/test/cctest/test_node_crypto.cc b/test/cctest/test_node_crypto.cc
@@ -2,7 +2,7 @@
 // and settting it to a file that does not exist.
 #define NODE_OPENSSL_SYSTEM_CERT_PATH "/missing/ca.pem"
 
-#include "../../src/crypto/crypto_context.cc"  // NOLINT(build/include)
+#include "crypto/crypto_context.h"
 #include "node_options.h"
 #include "openssl/err.h"
 #include "gtest/gtest.h"