91 lines
2.7 KiB
Diff
91 lines
2.7 KiB
Diff
From 4ea8ba0dcc7fe20c8fff7f574304e749bd37ecea Mon Sep 17 00:00:00 2001
|
|
From: Haikel Guemar <hguemar@fedoraproject.org>
|
|
Date: Tue, 26 Jul 2016 22:00:25 +0200
|
|
Subject: [PATCH 3/4] CA Certificates are provided by Fedora.
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Forwarded: need some feedback before submitting the matter upstream
|
|
Author: Jérémy Lal <kapouer@melix.org>
|
|
Last-Update: 2014-03-02
|
|
|
|
Modified 2014-05-02 by T.C. Hollingsworth <tchollingsworth@gmail.com> with the
|
|
correct path for Fedora
|
|
|
|
Modified 2015-12-01 by Stephen Gallagher <sgallagh@redhat.com> to update for
|
|
Node.js 4.2
|
|
|
|
Modified 2016-03-04 by Stephen Gallagher <sgallagh@redhat.com> to update for
|
|
Node.js 5.4.1
|
|
|
|
Modified 2016-07-26 by Haikel Guemar <hguemar@fedoraproject.org> to update for
|
|
Node.js 4.4.7
|
|
---
|
|
src/node_crypto.cc | 30 +++++++++---------------------
|
|
1 file changed, 9 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
|
|
index 89cd651248361d4fff3c442d5e36cc66e6f49bf4..4fadc0a001422dea3aeade330f8f596c0dab36ee 100644
|
|
--- a/src/node_crypto.cc
|
|
+++ b/src/node_crypto.cc
|
|
@@ -190,12 +190,12 @@ static X509_NAME *cnnic_ev_name =
|
|
d2i_X509_NAME(nullptr, &cnnic_ev_p,
|
|
sizeof(CNNIC_EV_ROOT_CA_SUBJECT_DATA)-1);
|
|
|
|
static Mutex* mutexes;
|
|
|
|
-const char* const root_certs[] = {
|
|
-#include "node_root_certs.h" // NOLINT(build/include_order)
|
|
+const char* root_certs[] = {
|
|
+ NULL
|
|
};
|
|
|
|
X509_STORE* root_cert_store;
|
|
|
|
// Just to generate static methods
|
|
@@ -845,33 +845,21 @@ void SecureContext::AddRootCerts(const FunctionCallbackInfo<Value>& args) {
|
|
(void) &clear_error_on_return; // Silence compiler warning.
|
|
|
|
CHECK_EQ(sc->ca_store_, nullptr);
|
|
|
|
if (!root_cert_store) {
|
|
- root_cert_store = X509_STORE_new();
|
|
-
|
|
- for (size_t i = 0; i < arraysize(root_certs); i++) {
|
|
- BIO* bp = NodeBIO::NewFixed(root_certs[i], strlen(root_certs[i]));
|
|
- if (bp == nullptr) {
|
|
- return;
|
|
- }
|
|
-
|
|
- X509 *x509 = PEM_read_bio_X509(bp, nullptr, CryptoPemCallback, nullptr);
|
|
- if (x509 == nullptr) {
|
|
- BIO_free_all(bp);
|
|
- return;
|
|
- }
|
|
-
|
|
- X509_STORE_add_cert(root_cert_store, x509);
|
|
-
|
|
- BIO_free_all(bp);
|
|
- X509_free(x509);
|
|
+ if (SSL_CTX_load_verify_locations(sc->ctx_, "/etc/pki/tls/certs/ca-bundle.crt", NULL) == 1) {
|
|
+ root_cert_store = SSL_CTX_get_cert_store(sc->ctx_);
|
|
+ } else {
|
|
+ // empty store
|
|
+ root_cert_store = X509_STORE_new();
|
|
}
|
|
+ } else {
|
|
+ SSL_CTX_set_cert_store(sc->ctx_, root_cert_store);
|
|
}
|
|
|
|
sc->ca_store_ = root_cert_store;
|
|
- SSL_CTX_set_cert_store(sc->ctx_, sc->ca_store_);
|
|
}
|
|
|
|
|
|
void SecureContext::SetCiphers(const FunctionCallbackInfo<Value>& args) {
|
|
SecureContext* sc;
|
|
--
|
|
2.11.1
|
|
|