summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/TLS/OpenSSL/OpenSSLContext.cpp')
-rw-r--r--Swiften/TLS/OpenSSL/OpenSSLContext.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
index 5c80976..32d6470 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLContext.cpp
@@ -569,3 +569,3 @@ void OpenSSLContext::sendPendingDataToApplication() {
-bool OpenSSLContext::setCertificateChain(std::vector<std::unique_ptr<Certificate>>&& certificateChain) {
+bool OpenSSLContext::setCertificateChain(const std::vector<std::shared_ptr<Certificate>>& certificateChain) {
if (certificateChain.size() == 0) {
@@ -585,2 +585,5 @@ bool OpenSSLContext::setCertificateChain(std::vector<std::unique_ptr<Certificate
+ // Increment reference count on certificate so that it does not get freed when the SSL context is destroyed
+ openSSLCert->incrementReferenceCount();
+
if (certificateChain.size() > 1) {
@@ -591,2 +594,3 @@ bool OpenSSLContext::setCertificateChain(std::vector<std::unique_ptr<Certificate
}
+
if (SSL_CTX_add_extra_chain_cert(context_.get(), openSSLCert->getInternalX509().get()) != 1) {
@@ -595,3 +599,4 @@ bool OpenSSLContext::setCertificateChain(std::vector<std::unique_ptr<Certificate
}
- certificate->release();
+
+ openSSLCert->incrementReferenceCount();
}