github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove OPENSSL_VERSION_NUMBER version check for the CAPath option in libcurl (#5009)

Browse Source 
* Remove OPENSSL_VERSION_NUMBER version check for the CAPath option in
libcurl.

* Revert unit test change that caused an intentional error.

* Remove the openssl header.
This commit is contained in:
Ahson Khan 2023-10-05 13:30:46 -07:00 committed by GitHub
parent 81d95c951f
commit 9a2c2e1257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/core/azure-core/inc/azure/core/http/curl_transport.hpp
View File

@ -14,13 +14,6 @@
#include "azure/core/http/transport.hpp"
#include "azure/core/platform.hpp"
#if defined(AZ_PLATFORM_LINUX)
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER >= 0x00905100L
#define _azure_SUPPORT_SETTING_CAPATH
#endif // OPENSSL_VERSION_NUMBER >= 0x00905100L
#endif // defined(AZ_PLATFORM_LINUX)
namespace Azure { namespace Core { namespace Http {
class CurlNetworkConnection;
@ -130,7 +123,7 @@ namespace Azure { namespace Core { namespace Http {
*/
std::string CAInfo;
#if defined(_azure_SUPPORT_SETTING_CAPATH)
#if defined(AZ_PLATFORM_LINUX)
/**
* @brief Path to a directory which holds PEM encoded file, containing the certificate
* authorities sent to libcurl handle directly.

4
sdk/core/azure-core/src/http/curl/curl.cpp
View File

@ -1283,7 +1283,7 @@ inline std::string GetConnectionKey(std::string const& host, CurlTransportOption
key.append(",");
key.append(!options.CAInfo.empty() ? options.CAInfo : "0");
key.append(",");
#if defined(_azure_SUPPORT_SETTING_CAPATH)
#if defined(AZ_PLATFORM_LINUX)
key.append(!options.CAPath.empty() ? options.CAPath : "0");
#else
key.append("0"); // CAPath is always empty on Windows;
@ -2320,7 +2320,7 @@ CurlConnection::CurlConnection(
}
}
#if defined(_azure_SUPPORT_SETTING_CAPATH)
#if defined(AZ_PLATFORM_LINUX)
if (!options.CAPath.empty())
{
if (!SetLibcurlOption(m_handle, CURLOPT_CAPATH, options.CAPath.c_str(), &result))

2
sdk/core/azure-core/test/ut/curl_options_test.cpp
View File

@ -235,7 +235,7 @@ namespace Azure { namespace Core { namespace Test {
.ConnectionPoolIndex.clear());
}
#if defined(_azure_SUPPORT_SETTING_CAPATH)
#if defined(AZ_PLATFORM_LINUX)
TEST(CurlTransportOptions, setCADirectory)
{
Azure::Core::Http::CurlTransportOptions curlOptions;