1 files changed, 18 insertions, 32 deletions
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
index 58d36083bccb..15d7d598ad11 100644
--- a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
@@ -1,36 +1,22 @@
-Patch based on Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtnetwork/files/qtnetwork-5.15.1-libressl.patch?id=c60b2b11bd17afca9bbe546db12918f789b57e25
---- src/network/ssl/qsslcontext_openssl.cpp.orig	2021-12-07 13:51:35 UTC
+--- src/network/ssl/qsslcontext_openssl.cpp.orig	2022-06-28 10:17:59 UTC
 +++ src/network/ssl/qsslcontext_openssl.cpp
-@@ -408,16 +408,28 @@ init_context:
-         maxVersion = DTLS1_VERSION;
-         break;
-     case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
-         minVersion = DTLS1_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
-         break;
-     case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS1_2_VERSION;
-+#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
-         break;
-     case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
-         minVersion = DTLS1_2_VERSION;
-         maxVersion = DTLS_MAX_VERSION;
+@@ -356,11 +356,15 @@ init_context:
+         q_SSL_CTX_set_security_level(sslContext->ctx, 1);
+ 
+     const long anyVersion =
++#ifndef TLS_ANY_VERSION
++	    		    0x1000;
 +#else
-+        Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
-         break;
-     case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +734,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
+ #if QT_CONFIG(dtls)
+                             isDtls ? DTLS_ANY_VERSION : TLS_ANY_VERSION;
+ #else
+                             TLS_ANY_VERSION;
+ #endif // dtls
++#endif
+     long minVersion = anyVersion;
+     long maxVersion = anyVersion;
+ 
+@@ -722,6 +726,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
      }
  #endif // ocsp
  
@@ -38,7 +24,7 @@ Patch based on Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-qt/qtn
      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);
-@@ -768,7 +781,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
+@@ -768,7 +773,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
              sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
              sslContext->errorCode = QSslError::UnspecifiedError;
          }