53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 655af65a132fe7cea8aeff4f8cbc9d06181f3d2e Mon Sep 17 00:00:00 2001
|
|
From: Stephen Gallagher <sgallagh@redhat.com>
|
|
Date: Tue, 15 Aug 2017 09:34:07 -0400
|
|
Subject: [PATCH 3/3] EPEL openssl 1.0.1
|
|
|
|
---
|
|
src/node_crypto.cc | 2 --
|
|
src/node_crypto.h | 7 +++++++
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
|
|
index 7aaff07fb513945d6272f238814a4cd297da7b0e..b5fb547ce35b4c66e8a52de9324f83f9a25aff7a 100644
|
|
--- a/src/node_crypto.cc
|
|
+++ b/src/node_crypto.cc
|
|
@@ -959,12 +959,10 @@ void SecureContext::AddRootCerts(const FunctionCallbackInfo<Value>& args) {
|
|
ERR_error_string(err, nullptr));
|
|
}
|
|
}
|
|
}
|
|
|
|
- // Increment reference count so global store is not deleted along with CTX.
|
|
- X509_STORE_up_ref(root_cert_store);
|
|
SSL_CTX_set_cert_store(sc->ctx_, root_cert_store);
|
|
}
|
|
|
|
|
|
void SecureContext::SetCiphers(const FunctionCallbackInfo<Value>& args) {
|
|
diff --git a/src/node_crypto.h b/src/node_crypto.h
|
|
index 8304e719719dae41757071b4463f8631cb1e442f..a5161aa502e56a6ceb9522ce0ad9c8a677291081 100644
|
|
--- a/src/node_crypto.h
|
|
+++ b/src/node_crypto.h
|
|
@@ -151,10 +151,17 @@ class SecureContext : public BaseObject {
|
|
if (!ctx_) {
|
|
return;
|
|
}
|
|
|
|
env()->isolate()->AdjustAmountOfExternalAllocatedMemory(-kExternalSize);
|
|
+ if (ctx_->cert_store == root_cert_store) {
|
|
+ // SSL_CTX_free() will attempt to free the cert_store as well.
|
|
+ // Since we want our root_cert_store to stay around forever
|
|
+ // we just clear the field. Hopefully OpenSSL will not modify this
|
|
+ // struct in future versions.
|
|
+ ctx_->cert_store = nullptr;
|
|
+ }
|
|
SSL_CTX_free(ctx_);
|
|
if (cert_ != nullptr)
|
|
X509_free(cert_);
|
|
if (issuer_ != nullptr)
|
|
X509_free(issuer_);
|
|
--
|
|
2.13.5
|
|
|