Skip to content

PS-10970 fix oracle8 compilation #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lukin-oleksiy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PS-10970 fix oracle8 compilation #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion kmipclient/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ project(kmipclient)
set(CMAKE_CXX_STANDARD 20)

find_package(OpenSSL REQUIRED)
find_package(Threads REQUIRED)

add_library(
kmipclient
Expand Down Expand Up @@ -43,7 +44,7 @@ target_include_directories(
$<INSTALL_INTERFACE:include>
)

target_link_libraries(kmipclient PUBLIC kmipcore OpenSSL::SSL OpenSSL::Crypto)
target_link_libraries(kmipclient PUBLIC kmipcore OpenSSL::SSL OpenSSL::Crypto Threads::Threads)

set_property(TARGET kmipclient PROPERTY POSITION_INDEPENDENT_CODE ON)

Expand Down
35 changes: 33 additions & 2 deletions kmipclient/src/NetClientOpenSSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include <fcntl.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#include <openssl/x509.h>
#include <openssl/x509_vfy.h>
#include <poll.h>
#include <sstream>
Expand Down Expand Up @@ -67,6 +68,28 @@ namespace kmipclient {
return inet_pton(AF_INET6, host.c_str(), &addr6) == 1;
}

// TLS_method() was introduced in OpenSSL 1.1.0.
// Older builds (OpenSSL < 1.1.0) use the SSLv23_method() alias.
static const SSL_METHOD *get_tls_client_method() {
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
return SSLv23_method();
#else
return TLS_method();
#endif
}

// SSL_get0_peer_certificate() (borrowed ref, no X509_free needed) was
// introduced in OpenSSL 3.0. OpenSSL 1.0.x and 1.1.x — including the
// OpenSSL 1.1.1 shipped with Oracle Linux 8 — only have
// SSL_get_peer_certificate() which bumps the refcount and requires X509_free.
static X509 *get_peer_certificate(SSL *ssl) {
#if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(LIBRESSL_VERSION_NUMBER)
return SSL_get0_peer_certificate(ssl);
#else
return SSL_get_peer_certificate(ssl);
#endif
}

static void configure_tls_verification(
SSL_CTX *ctx,
SSL *ssl,
Expand Down Expand Up @@ -141,13 +164,19 @@ namespace kmipclient {
return;
}

if (SSL_get0_peer_certificate(ssl) == nullptr) {
X509 *peer_cert = get_peer_certificate(ssl);
if (peer_cert == nullptr) {
throw KmipIOException(
kmipcore::KMIP_IO_FAILURE,
"TLS peer verification failed: server did not present a certificate"
);
}

#if OPENSSL_VERSION_NUMBER < 0x30000000L || defined(LIBRESSL_VERSION_NUMBER)
// SSL_get_peer_certificate() bumps the refcount; release the reference.
X509_free(peer_cert);
#endif

const long verify_result = SSL_get_verify_result(ssl);
if (verify_result != X509_V_OK) {
throw KmipIOException(
Expand Down Expand Up @@ -328,7 +357,9 @@ namespace kmipclient {
ctx_.reset();
}

std::unique_ptr<SSL_CTX, SslCtxDeleter> new_ctx(SSL_CTX_new(TLS_method()));
std::unique_ptr<SSL_CTX, SslCtxDeleter> new_ctx(
SSL_CTX_new(get_tls_client_method())
);
if (!new_ctx) {
throw KmipIOException(
kmipcore::KMIP_IO_FAILURE,
Expand Down
2 changes: 1 addition & 1 deletion kmipcore/include/kmipcore/kmipcore_version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/** @brief kmipcore semantic version minor component. */
#define KMIPCORE_VERSION_MINOR 1
/** @brief kmipcore semantic version patch component. */
#define KMIPCORE_VERSION_PATCH 1
#define KMIPCORE_VERSION_PATCH 2

/** @brief Internal helper for macro stringification. */
#define KMIPCORE_STRINGIFY_I(x) #x
Expand Down