Attachment 179597 Details for Bug 216781 – patch

[patch] patch

qt5-network.patch (text/plain), 2.12 KB, created by Piotr Kubaj on 2017-02-04 14:34:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2017-02-04 14:34:08 UTC

Size: 2.12 KB

patch

obsolete

>Index: files/patch-src_network_ssl_qsslcontext__openssl.cpp
>===================================================================
>--- files/patch-src_network_ssl_qsslcontext__openssl.cpp	(revision 433169)
>+++ files/patch-src_network_ssl_qsslcontext__openssl.cpp	(working copy)
>@@ -1,29 +1,20 @@
>-Obtained from: https://github.com/libressl-portable/openbsd/issues/33
>-
>-From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001
>-From: hasufell <hasufell@gentoo.org>
>-Date: Sat, 10 Oct 2015 01:15:01 +0200
>-Subject: [PATCH] Fix compilation with libressl
>-
>-By additionally checking for defined(SSL_CTRL_SET_CURVES), which
>-is defined in openssl, but not in libressl.
>---- src/network/ssl/qsslcontext_openssl.cpp.orig	2015-10-13 04:35:28 UTC
>+--- src/network/ssl/qsslcontext_openssl.cpp.orig	2016-09-16 05:49:42 UTC
> +++ src/network/ssl/qsslcontext_openssl.cpp
>-@@ -338,7 +338,7 @@ init_context:
>+@@ -340,7 +341,7 @@ init_context:
>  
>      const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
>      if (!qcurves.isEmpty()) {
> -#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
>-+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
>++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)
>          // Set the curves to be used
>          if (q_SSLeay() >= 0x10002000L) {
>              // SSL_CTX_ctrl wants a non-const pointer as last argument,
>-@@ -352,7 +352,7 @@ init_context:
>+@@ -354,7 +355,7 @@ init_context:
>                  return sslContext;
>              }
>          } else
> -#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
>-+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
>++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) && !defined(LIBRESSL_VERSION_NUMBER)
>          {
>              // specific curves requested, but not possible to set -> error
>              sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));

Actions: View | Diff

Attachments on bug 216781: 179597 | 180112 | 180114 | 180133