mirror of https://github.com/openbsd/ports.git
52 lines
1.9 KiB
Plaintext
52 lines
1.9 KiB
Plaintext
Index: src/plugins/tls/openssl/qsslcontext_openssl.cpp
|
|
--- src/plugins/tls/openssl/qsslcontext_openssl.cpp.orig
|
|
+++ src/plugins/tls/openssl/qsslcontext_openssl.cpp
|
|
@@ -49,9 +49,9 @@ extern "C" int q_verify_cookie_callback(SSL *ssl, cons
|
|
}
|
|
#endif // dtls
|
|
|
|
-#ifdef TLS1_3_VERSION
|
|
+#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
extern "C" int q_ssl_sess_set_new_cb(SSL *context, SSL_SESSION *session);
|
|
-#endif // TLS1_3_VERSION
|
|
+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER
|
|
|
|
static inline QString msgErrorSettingBackendConfig(const QString &why)
|
|
{
|
|
@@ -663,14 +663,14 @@ QT_WARNING_POP
|
|
q_SSL_CTX_set_verify(sslContext->ctx, verificationMode, verificationCallback);
|
|
}
|
|
|
|
-#ifdef TLS1_3_VERSION
|
|
+#if defined(TLS1_3_VERSION) && !defined(LIBRESSL_VERSION_NUMBER)
|
|
// NewSessionTicket callback:
|
|
if (mode == QSslSocket::SslClientMode && !isDtls) {
|
|
q_SSL_CTX_sess_set_new_cb(sslContext->ctx, q_ssl_sess_set_new_cb);
|
|
q_SSL_CTX_set_session_cache_mode(sslContext->ctx, SSL_SESS_CACHE_CLIENT);
|
|
}
|
|
|
|
-#endif // TLS1_3_VERSION
|
|
+#endif // TLS1_3_VERSION && LIBRESSL_VERSION_NUMBER
|
|
|
|
#if QT_CONFIG(dtls)
|
|
// DTLS cookies:
|
|
@@ -758,6 +758,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
|
|
}
|
|
#endif // ocsp
|
|
|
|
+#ifndef LIBRESSL_VERSION_NUMBER
|
|
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
|
|
if (cctx) {
|
|
q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
|
|
@@ -804,7 +805,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
|
|
sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
|
|
sslContext->errorCode = QSslError::UnspecifiedError;
|
|
}
|
|
- } else {
|
|
+ } else
|
|
+#endif // LIBRESSL_VERSION_NUMBER
|
|
+ {
|
|
sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
|
|
sslContext->errorCode = QSslError::UnspecifiedError;
|
|
}
|