summaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@oath.com>2019-01-24 12:41:24 +0100
committerGitHub <noreply@github.com>2019-01-24 12:41:24 +0100
commitd1d6be774684cd6382614ec86789e896461edfae (patch)
tree46aa111fb9245bfa38b9d4b30ab2a457051f90e2 /vespalib
parent3bedd11a1e1e48d5218fe5ea0527443873b4965b (diff)
parent33fa2ddee9ac1d3c9bd19933744544a70fcae143 (diff)
Merge pull request #8194 from vespa-engine/toregge/less-const-in-openssl-tls-context-impl
Use less `const`, to allow compilation when using openssl 1.1.0g or 1.1.0i
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp b/vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp
index fb29af21ea8..130847b49a7 100644
--- a/vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp
+++ b/vespalib/src/vespa/vespalib/net/tls/impl/openssl_tls_context_impl.cpp
@@ -411,9 +411,9 @@ int OpenSslTlsContextImpl::verify_cb_wrapper(int preverified_ok, ::X509_STORE_CT
return 1; // OK for root/intermediate cert. Callback will be invoked again for other certs.
}
// Fetch the SSL instance associated with the X509_STORE_CTX
- const void* data = ::X509_STORE_CTX_get_ex_data(store_ctx, ::SSL_get_ex_data_X509_STORE_CTX_idx());
+ void* data = ::X509_STORE_CTX_get_ex_data(store_ctx, ::SSL_get_ex_data_X509_STORE_CTX_idx());
LOG_ASSERT(data != nullptr);
- const auto* ssl = static_cast<const ::SSL*>(data);
+ auto* ssl = static_cast<::SSL*>(data);
const ::SSL_CTX* ssl_ctx = ::SSL_get_SSL_CTX(ssl);
LOG_ASSERT(ssl_ctx != nullptr);
auto* self = static_cast<OpenSslTlsContextImpl*>(SSL_CTX_get_app_data(ssl_ctx));