From 95ce5dd24963229f9bbfe4e1736331b9c01ce18a Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Mon, 12 Mar 2018 16:55:39 -0400 Subject: [PATCH 1/2] MINIFICPP-424: Manually specify CAFile so users do not need to update the cert bundle on their local machine Set path and CAfile to NULL to avoid using them --- extensions/http-curl/client/HTTPClient.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extensions/http-curl/client/HTTPClient.cpp b/extensions/http-curl/client/HTTPClient.cpp index 5ea9e95027..da0ba2ef4f 100644 --- a/extensions/http-curl/client/HTTPClient.cpp +++ b/extensions/http-curl/client/HTTPClient.cpp @@ -334,6 +334,8 @@ void HTTPClient::configure_secure_connection(CURL *http_session) { logger_->log_debug("Using certificate file %s", ssl_context_service_->getCertificateFile()); curl_easy_setopt(http_session, CURLOPT_SSL_CTX_FUNCTION, &configure_ssl_context); curl_easy_setopt(http_session, CURLOPT_SSL_CTX_DATA, static_cast(ssl_context_service_.get())); + curl_easy_setopt(http_session, CURLOPT_CAINFO, 0); + curl_easy_setopt(http_session, CURLOPT_CAPATH, 0); } bool HTTPClient::isSecure(const std::string &url) { From a80aa194807733d68070f71131dedb3958ed4abd Mon Sep 17 00:00:00 2001 From: Marc Parisi Date: Tue, 13 Mar 2018 14:26:43 -0400 Subject: [PATCH 2/2] MINIFICPP-424: Update readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 40dfd4aa71..7af4cbbfcb 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ or greater is recommended. #### Libraries / Development Headers * libboost and boost-devel * 1.48.0 or greater -* libcurl +* libcurl-openssl * librocksdb4.1 and librocksdb-dev * libuuid and uuid-dev * openssl @@ -155,7 +155,7 @@ Finally, it is required to add the `-lrt` compiler flag by using the #### Libraries * libuuid * librocksdb *** IF NOT INSTALLED, WILL BE BUILT FROM THIRD PARTY DIRECTORY *** -* libcurl +* libcurl-openssl * libssl and libcrypto from openssl * libarchive * librdkafka @@ -178,7 +178,6 @@ $ yum install cmake \ gcc gcc-c++ \ bison \ flex \ - libcurl-devel \ rocksdb-devel rocksdb \ libuuid libuuid-devel \ boost-devel \ @@ -200,6 +199,7 @@ $ yum install docker python-virtualenv $ yum install gpsd-devel $ # (Optional) for PacketCapture Processor $ yum install libpcap-devel +$ #depending on your yum repo you may need to manually build libcurl-openssl if you do not have it. ``` ##### Aptitude based Linux Distributions @@ -209,7 +209,7 @@ $ apt-get install cmake \ gcc g++ \ bison \ flex \ - libcurl-dev \ + libcurl4-openssl-dev \ librocksdb-dev librocksdb4.1 \ uuid-dev uuid \ libboost-all-dev libssl-dev \