commit 77b579b0ba2fe644bbd902f70178d7af12eb5f70
author Andre Araujo <asdaraujo@gmail.com> Sun Oct 20 05:21:13 2019 +0000
committer Arpad Boda <arpad.zoltan.boda@gmail.com> Tue Oct 22 05:44:12 2019 +0000
tree 8c8b410c14ba886f7946dda32f4deaff96eeacd5
parent db5d8efbe4c4d7ced5f807cd871400d2a344aba7

MINIFICPP-1068 - Load entire certificate chain from PEM certificate file.

Signed-off-by: Arpad Boda <aboda@apache.org>

This closes #665

libminifi/src/controllers/SSLContextService.cpp

diff --git a/libminifi/src/controllers/SSLContextService.cpp b/libminifi/src/controllers/SSLContextService.cpp
index 10944e2..41957c5 100644
--- a/libminifi/src/controllers/SSLContextService.cpp
+++ b/libminifi/src/controllers/SSLContextService.cpp
@@ -89,7 +89,7 @@
       EVP_PKEY_free(pkey);
       X509_free(cert);
     } else {
-      if (SSL_CTX_use_certificate_file(ctx, certificate.c_str(), SSL_FILETYPE_PEM) <= 0) {
+      if (SSL_CTX_use_certificate_chain_file(ctx, certificate.c_str()) <= 0) {
         logging::LOG_ERROR(logger_) << "Could not create load certificate " << certificate << ", " << getLatestOpenSSLErrorString();
         return false;
       }

libminifi/src/io/tls/TLSSocket.cpp

diff --git a/libminifi/src/io/tls/TLSSocket.cpp b/libminifi/src/io/tls/TLSSocket.cpp
index e7909a0..9b094ea 100644
--- a/libminifi/src/io/tls/TLSSocket.cpp
+++ b/libminifi/src/io/tls/TLSSocket.cpp
@@ -92,7 +92,7 @@
       }
     }
     // load certificates and private key in PEM format
-    if (SSL_CTX_use_certificate_file(ctx, certificate.c_str(), SSL_FILETYPE_PEM) <= 0) {
+    if (SSL_CTX_use_certificate_chain_file(ctx, certificate.c_str()) <= 0) {
       logger_->log_error("Could not load certificate %s, for %X and %X error : %s", certificate, this, ctx, std::strerror(errno));
       error_value = TLS_ERROR_CERT_MISSING;
       return error_value;