1 --- src/network/ssl/qsslsocket_openssl.cpp.orig 2022-12-09 10:58:56 UTC 2 +++ src/network/ssl/qsslsocket_openssl.cpp 3 @@ -246,6 +246,12 @@ static int q_ssl_psk_use_session_callback(SSL *ssl, co 4 return 1; // need to return 1 or else "the connection setup fails." 5 } 6 7 +#endif // TLS1_3_VERSION 8 + 9 +#endif // !OPENSSL_NO_PSK 10 + 11 +#if (!defined(OPENSSL_NO_PSK) || defined(LIBRESSL_VERSION_NUMBER)) \ 12 + && defined(TLS1_3_VERSION) 13 int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *session) 14 { 15 if (!ssl) { 16 @@ -261,10 +267,8 @@ int q_ssl_sess_set_new_cb(SSL *ssl, SSL_SESSION *sessi 17 QSslSocketBackendPrivate::s_indexForSSLExtraData)); 18 return socketPrivate->handleNewSessionTicket(ssl); 19 } 20 -#endif // TLS1_3_VERSION 21 +#endif 22 23 -#endif // !OPENSSL_NO_PSK 24 - 25 #if QT_CONFIG(ocsp) 26 27 int qt_OCSP_status_server_callback(SSL *ssl, void *ocspRequest) 28 @@ -660,7 +664,7 @@ bool QSslSocketBackendPrivate::initSslContext() 29 else if (mode == QSslSocket::SslServerMode) 30 q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); 31 32 -#if OPENSSL_VERSION_NUMBER >= 0x10101006L 33 +#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) 34 // Set the client callback for TLSv1.3 PSK 35 if (mode == QSslSocket::SslClientMode 36 && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { 37