Attachment #180112 for bug #216781

Lines 26-32 Link Here

(-)net/qt5-network/Makefile (-1 / +2 lines)
26		26
27	post-patch:	27	post-patch:
28	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	28	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
29	${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp \	29	${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp
		30	@${REINPLACE_CMD} -e 's\|%%OPENSSLLIB%%\|${OPENSSLLIB}\|g' \
30	${BUILD_WRKSRC}/ssl/qsslsocket_openssl_symbols.cpp	31	${BUILD_WRKSRC}/ssl/qsslsocket_openssl_symbols.cpp
31		32
32	post-build:	33	post-build:




--- src/network/ssl/qsslcontext_openssl.cpp.orig	2016-09-16 05:49:42 UTC

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
@@ -343,15 +343,25 @@ init_context:
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
     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)
         // Set the curves to be used
         if (q_SSLeay() >= 0x10002000L) {
-            // SSL_CTX_ctrl wants a non-const pointer as last argument,
-            // but let's avoid a copy into a temporary array
-            if (!q_SSL_CTX_ctrl(sslContext->ctx,
-                                SSL_CTRL_SET_CURVES,
-                                qcurves.size(),
-                                const_cast<int *>(reinterpret_cast<const int *>(qcurves.data())))) {
-                sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
-                sslContext->errorCode = QSslError::UnspecifiedError;
-                return sslContext;
+            switch (q_SSL_CTX_set1_curves(sslContext->ctx,
+                                     const_cast<int *>(reinterpret_cast<const int *>(qcurves.data())),
+                                     qcurves.size())) {
+                case 1:
+                default:
+                    break;
+                case 0:
+                    sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
+                    sslContext->errorCode = QSslError::UnspecifiedError;
+                    return sslContext;
+                case -1:
+                    if (q_SSL_CTX_set1_groups(sslContext->ctx,
+                                            reinterpret_cast<const int *>(qcurves.data()),
+                                            qcurves.size()) < 1) {
+                        sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
+                        sslContext->errorCode = QSslError::UnspecifiedError;
+                        return sslContext;
+                    }
+                    break;
             }
         } else
 #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
         {
             // specific curves requested, but not possible to set -> error
             sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));




--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2016-09-16 05:49:42 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -424,6 +424,8 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ec
 DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return)
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
 DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return)
+DEFINEFUNC3(int, SSL_CTX_set1_curves, SSL_CTX *a, a, int *b, b, int c, c, return -1, return)
+DEFINEFUNC3(int, SSL_CTX_set1_groups, SSL_CTX *a, a, const int *b, b, size_t c, c, return -1, return)
 #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
 #endif // OPENSSL_NO_EC
 
@@ -652,8 +654,8 @@ static QPair<QLibrary*, QLibrary*> loadO
 #endif
 #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
     if (libcrypto->load() && libssl->load()) {
         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
         return pair;
@@ -670,8 +672,8 @@ static QPair<QLibrary*, QLibrary*> loadO
     //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), -1);
+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), -1);
     if (libcrypto->load() && libssl->load()) {
         // libssl.so.0 and libcrypto.so.0 found
         return pair;
@@ -976,8 +978,11 @@ bool q_resolveOpenSslSymbols()
     RESOLVEFUNC(EC_KEY_free)
     RESOLVEFUNC(EC_get_builtin_curves)
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
-    if (q_SSLeay() >= 0x10002000L)
+    if (q_SSLeay() >= 0x10002000L) {
         RESOLVEFUNC(EC_curve_nist2nid)
+        RESOLVEFUNC(SSL_CTX_set1_curves)
+        RESOLVEFUNC(SSL_CTX_set1_groups)
+	}
 #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
 #endif // OPENSSL_NO_EC
     RESOLVEFUNC(PKCS12_parse)

Line 0 Link Here

(-)net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h (+11 lines)
	1	--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2016-09-16 05:49:42 UTC
	2	+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
	3	@@ -481,6 +481,8 @@ void q_EC_KEY_free(EC_KEY *ecdh);
	4	size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
	5	#if OPENSSL_VERSION_NUMBER >= 0x10002000L
	6	int q_EC_curve_nist2nid(const char *name);
	7	+int q_SSL_CTX_set1_curves(SSL_CTX a, int b, int c);
	8	+int q_SSL_CTX_set1_groups(SSL_CTX a, const int b, size_t c);
	9	#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
	10	#endif // OPENSSL_NO_EC
	11

Return to bug 216781

Lines 1-29 Link Here

(-)net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp (-24 / +32 lines)
1	Obtained from: https://github.com/libressl-portable/openbsd/issues/33	1	--- src/network/ssl/qsslcontext_openssl.cpp.orig 2016-09-16 05:49:42 UTC
2
3	From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001
4	From: hasufell <hasufell@gentoo.org>
5	Date: Sat, 10 Oct 2015 01:15:01 +0200
6	Subject: [PATCH] Fix compilation with libressl
7
8	By additionally checking for defined(SSL_CTRL_SET_CURVES), which
9	is defined in openssl, but not in libressl.
10	--- src/network/ssl/qsslcontext_openssl.cpp.orig 2015-10-13 04:35:28 UTC
11	+++ src/network/ssl/qsslcontext_openssl.cpp	2	+++ src/network/ssl/qsslcontext_openssl.cpp
12	@@ -338,7 +338,7 @@ init_context:	3	@@ -343,15 +343,25 @@ init_context:
13		4	#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
14	const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
15	if (!qcurves.isEmpty()) {
16	-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
17	+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
18	// Set the curves to be used	5	// Set the curves to be used
19	if (q_SSLeay() >= 0x10002000L) {	6	if (q_SSLeay() >= 0x10002000L) {
20	// SSL_CTX_ctrl wants a non-const pointer as last argument,	7	- // SSL_CTX_ctrl wants a non-const pointer as last argument,
21	@@ -352,7 +352,7 @@ init_context:	8	- // but let's avoid a copy into a temporary array
22	return sslContext;	9	- if (!q_SSL_CTX_ctrl(sslContext->ctx,
		10	- SSL_CTRL_SET_CURVES,
		11	- qcurves.size(),
		12	- const_cast<int >(reinterpret_cast<const int >(qcurves.data())))) {
		13	- sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
		14	- sslContext->errorCode = QSslError::UnspecifiedError;
		15	- return sslContext;
		16	+ switch (q_SSL_CTX_set1_curves(sslContext->ctx,
		17	+ const_cast<int >(reinterpret_cast<const int >(qcurves.data())),
		18	+ qcurves.size())) {
		19	+ case 1:
		20	+ default:
		21	+ break;
		22	+ case 0:
		23	+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
		24	+ sslContext->errorCode = QSslError::UnspecifiedError;
		25	+ return sslContext;
		26	+ case -1:
		27	+ if (q_SSL_CTX_set1_groups(sslContext->ctx,
		28	+ reinterpret_cast<const int *>(qcurves.data()),
		29	+ qcurves.size()) < 1) {
		30	+ sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
		31	+ sslContext->errorCode = QSslError::UnspecifiedError;
		32	+ return sslContext;
		33	+ }
		34	+ break;
23	}	35	}
24	} else	36	} else
25	-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)	37	#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
26	+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
27	{
28	// specific curves requested, but not possible to set -> error
29	sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));