View | Details | Raw Unified | Return to bug 230884 | Differences between
and this patch

Collapse All | Expand All

(-)net/qt5-network/files/patch-src_network_kernel_qnetworkinterface__unix.cpp (+12 lines)
Line 0 Link Here
1
--- src/network/kernel/qnetworkinterface_unix.cpp.orig	2018-06-15 07:29:31 UTC
2
+++ src/network/kernel/qnetworkinterface_unix.cpp
3
@@ -463,9 +463,6 @@ static QNetworkInterface::InterfaceType probeIfType(in
4
         case IFM_ETHER:
5
             return QNetworkInterface::Ethernet;
6
 
7
-        case IFM_FDDI:
8
-            return QNetworkInterface::Fddi;
9
-
10
         case IFM_IEEE80211:
11
             return QNetworkInterface::Ieee80211;
12
         }
(-)net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp (+11 lines)
Line 0 Link Here
1
--- src/network/ssl/qsslcontext_openssl.cpp.orig	2018-06-15 07:29:31 UTC
2
+++ src/network/ssl/qsslcontext_openssl.cpp
3
@@ -248,7 +248,7 @@ void QSslContext::applyBackendConfig(QSs
4
     if (sslContext->sslConfiguration.backendConfiguration().isEmpty())
5
         return;
6
 
7
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
8
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
9
     if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
10
         QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
11
         if (cctx) {
(-)net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl11__symbols__p.h (+85 lines)
Line 0 Link Here
1
--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig	2018-06-15 07:29:31 UTC
2
+++ src/network/ssl/qsslsocket_openssl11_symbols_p.h
3
@@ -75,15 +75,48 @@
4
 #error "You are not supposed to use this header file, include qsslsocket_openssl_symbols_p.h instead"
5
 #endif
6
 
7
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
8
+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
9
+typedef struct stack_st OPENSSL_STACK; /* Use STACK_OF(...) instead */
10
+// From the signature in LibreSSL
11
+#define OPENSSL_INIT_SETTINGS void
12
+// https://github.com/openssl/openssl/blob/master/include/openssl/x509_vfy.h#L63
13
+typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
14
+// https://github.com/openssl/openssl/blob/master/include/openssl/tls1.h#L31
15
+# define TLS1_2_VERSION 0x0303
16
+# define TLS_MAX_VERSION TLS1_2_VERSION
17
+# define TLS_ANY_VERSION 0x10000
18
+#endif
19
+
20
 const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
21
 
22
 Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
23
 Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
24
 
25
+#ifdef LIBRESSL_VERSION_NUMBER
26
+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
27
+#else
28
 int q_DSA_bits(DSA *a);
29
+#endif
30
 int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
31
 int q_EVP_PKEY_base_id(EVP_PKEY *a);
32
 int q_RSA_bits(RSA *a);
33
+#ifdef LIBRESSL_VERSION_NUMBER
34
+int q_sk_num(OPENSSL_STACK *a);
35
+void q_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
36
+OPENSSL_STACK *q_sk_new_null();
37
+void q_sk_push(OPENSSL_STACK *st, void *data);
38
+void q_sk_free(OPENSSL_STACK *a);
39
+void * q_sk_value(OPENSSL_STACK *a, int b);
40
+#define q_OPENSSL_sk_num(a) q_sk_num(a)
41
+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
42
+#define q_OPENSSL_sk_new_null() q_sk_new_null()
43
+#define q_OPENSSL_sk_push(a, b) q_sk_push(a, b)
44
+#define q_OPENSSL_sk_free q_sk_free
45
+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
46
+#define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
47
+#define q_SSL_session_reused(ssl) q_SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,0,NULL)
48
+#else
49
 int q_OPENSSL_sk_num(OPENSSL_STACK *a);
50
 void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
51
 OPENSSL_STACK *q_OPENSSL_sk_new_null();
52
@@ -92,6 +125,7 @@ void q_OPENSSL_sk_free(OPENSSL_STACK *a)
53
 void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
54
 int q_SSL_session_reused(SSL *a);
55
 unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
56
+#endif
57
 int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
58
 size_t q_SSL_get_client_random(SSL *a, unsigned char *out, size_t outlen);
59
 size_t q_SSL_SESSION_get_master_key(const SSL_SESSION *session, unsigned char *out, size_t outlen);
60
@@ -102,7 +136,11 @@ const SSL_METHOD *q_TLS_server_method();
61
 ASN1_TIME *q_X509_getm_notBefore(X509 *a);
62
 ASN1_TIME *q_X509_getm_notAfter(X509 *a);
63
 
64
+#ifdef LIBRESSL_VERSION_NUMBER
65
+#define q_X509_get_version(x509) q_ASN1_INTEGER_get((x509)->cert_info->version)
66
+#else
67
 long q_X509_get_version(X509 *a);
68
+#endif
69
 EVP_PKEY *q_X509_get_pubkey(X509 *a);
70
 void q_X509_STORE_set_verify_cb(X509_STORE *ctx, X509_STORE_CTX_verify_cb verify_cb);
71
 STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx);
72
@@ -112,8 +150,13 @@ int q_DH_bits(DH *dh);
73
 # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
74
                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
75
 
76
+#ifdef LIBRESSL_VERSION_NUMBER
77
+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
78
+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
79
+#else
80
 #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
81
 #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
82
+#endif
83
 
84
 #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
85
                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
(-)net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (-24 / +113 lines)
Lines 1-11 Link Here
1
* Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp
1
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2018-06-15 07:29:31 UTC
2
*
3
* Prepend the path of the SSL libraries used for building so the same libraries are
4
* found and loaded at runtime. Normal search finds base SSL libraries before ports.
5
*
6
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2017-11-30 13:49:46 UTC
7
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
2
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
8
@@ -524,6 +524,9 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ecdh, ecdh, retu
3
@@ -150,6 +150,14 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, 
4
 DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
5
 DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
6
 DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
7
+#ifdef LIBRESSL_VERSION_NUMBER
8
+DEFINEFUNC(int, sk_num, OPENSSL_STACK *a, a, return -1, return)
9
+DEFINEFUNC2(void, sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
10
+DEFINEFUNC(OPENSSL_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return 0, return)
11
+DEFINEFUNC2(void, sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
12
+DEFINEFUNC(void, sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
13
+DEFINEFUNC2(void *, sk_value, OPENSSL_STACK *a, a, int b, b, return 0, return)
14
+#else
15
 DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
16
 DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
17
 DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
18
@@ -159,6 +167,7 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSS
19
 DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return 0, return)
20
 DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
21
 DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
22
+#endif
23
 DEFINEFUNC3(size_t, SSL_get_client_random, SSL *a, a, unsigned char *out, out, size_t outlen, outlen, return 0, return)
24
 DEFINEFUNC3(size_t, SSL_SESSION_get_master_key, const SSL_SESSION *ses, ses, unsigned char *out, out, size_t outlen, outlen, return 0, return)
25
 DEFINEFUNC6(int, CRYPTO_get_ex_new_index, int class_index, class_index, long argl, argl, void *argp, argp, CRYPTO_EX_new *new_func, new_func, CRYPTO_EX_dup *dup_func, dup_func, CRYPTO_EX_free *free_func, free_func, return -1, return)
26
@@ -168,7 +177,9 @@ DEFINEFUNC(const SSL_METHOD *, TLS_clien
27
 DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return)
28
 DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *a, a, return 0, return)
29
 DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *a, a, return 0, return)
30
+#ifndef LIBRESSL_VERSION_NUMBER
31
 DEFINEFUNC(long, X509_get_version, X509 *a, a, return -1, return)
32
+#endif
33
 DEFINEFUNC(EVP_PKEY *, X509_get_pubkey, X509 *a, a, return 0, return)
34
 DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_verify_cb verify_cb, verify_cb, return, DUMMYARG)
35
 DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return)
36
@@ -406,7 +417,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey,
37
 DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
38
 DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
39
 DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return 0, return)
40
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
41
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
42
 DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return 0, return);
43
 DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
44
 DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
45
@@ -537,6 +548,9 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ec
9
 DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return)
46
 DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return)
10
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
47
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
11
 DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return)
48
 DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return)
Lines 15-43 Link Here
15
 #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
52
 #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
16
 #endif // OPENSSL_NO_EC
53
 #endif // OPENSSL_NO_EC
17
 
54
 
18
@@ -769,8 +772,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
55
@@ -782,8 +796,8 @@ static QPair<QLibrary*, QLibrary*> loadO
19
 #endif
56
 #endif
20
 #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
57
 #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
21
     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
58
     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
22
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
59
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
23
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
60
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
24
+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
61
+    libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
25
+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
62
+    libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
26
     if (libcrypto->load() && libssl->load()) {
63
     if (libcrypto->load() && libssl->load()) {
27
         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
64
         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
28
         return pair;
65
         return pair;
29
@@ -787,8 +790,8 @@ static QPair<QLibrary*, QLibrary*> loadOpenSsl()
66
@@ -800,8 +814,8 @@ static QPair<QLibrary*, QLibrary*> loadO
30
     //  macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
67
     //  macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
31
     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
68
     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
32
     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
69
     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
33
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
70
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
34
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
71
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
35
+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), -1);
72
+    libssl->setFileNameAndVersion(QLatin1String("/usr/local/lib/libssl"), -1);
36
+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), -1);
73
+    libcrypto->setFileNameAndVersion(QLatin1String("/usr/local/lib/libcrypto"), -1);
37
     if (libcrypto->load() && libssl->load()) {
74
     if (libcrypto->load() && libssl->load()) {
38
         // libssl.so.0 and libcrypto.so.0 found
75
         // libssl.so.0 and libcrypto.so.0 found
39
         return pair;
76
         return pair;
40
@@ -979,10 +982,9 @@ bool q_resolveOpenSslSymbols()
77
@@ -885,17 +899,30 @@ bool q_resolveOpenSslSymbols()
78
     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
79
     RESOLVEFUNC(EVP_PKEY_base_id)
80
     RESOLVEFUNC(RSA_bits)
81
+#ifdef LIBRESSL_VERSION_NUMBER
82
+    RESOLVEFUNC(sk_new_null)
83
+    RESOLVEFUNC(sk_push)
84
+    RESOLVEFUNC(sk_free)
85
+    RESOLVEFUNC(sk_num)
86
+    RESOLVEFUNC(sk_pop_free)
87
+    RESOLVEFUNC(sk_value)
88
+#else
89
     RESOLVEFUNC(OPENSSL_sk_new_null)
90
     RESOLVEFUNC(OPENSSL_sk_push)
91
     RESOLVEFUNC(OPENSSL_sk_free)
92
     RESOLVEFUNC(OPENSSL_sk_num)
93
     RESOLVEFUNC(OPENSSL_sk_pop_free)
94
     RESOLVEFUNC(OPENSSL_sk_value)
95
+#endif
96
     RESOLVEFUNC(DH_get0_pqg)
97
+#ifdef LIBRESSL_VERSION_NUMBER
98
+    RESOLVEFUNC(SSL_ctrl)
99
+#else
100
     RESOLVEFUNC(SSL_CTX_set_options)
101
+    RESOLVEFUNC(SSL_session_reused)
102
+#endif
103
     RESOLVEFUNC(SSL_get_client_random)
104
     RESOLVEFUNC(SSL_SESSION_get_master_key)
105
-    RESOLVEFUNC(SSL_session_reused)
106
     RESOLVEFUNC(SSL_get_session)
107
     RESOLVEFUNC(CRYPTO_get_ex_new_index)
108
     RESOLVEFUNC(TLS_method)
109
@@ -904,7 +931,9 @@ bool q_resolveOpenSslSymbols()
110
     RESOLVEFUNC(X509_STORE_CTX_get0_chain)
111
     RESOLVEFUNC(X509_getm_notBefore)
112
     RESOLVEFUNC(X509_getm_notAfter)
113
+#ifndef LIBRESSL_VERSION_NUMBER
114
     RESOLVEFUNC(X509_get_version)
115
+#endif
116
     RESOLVEFUNC(X509_get_pubkey)
117
     RESOLVEFUNC(X509_STORE_set_verify_cb)
118
     RESOLVEFUNC(CRYPTO_free)
119
@@ -921,7 +950,9 @@ bool q_resolveOpenSslSymbols()
120
 
121
     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
122
     RESOLVEFUNC(DH_bits)
123
+#ifndef LIBRESSL_VERSION_NUMBER
124
     RESOLVEFUNC(DSA_bits)
125
+#endif
126
 
127
 #else // !opensslv11
128
 
129
@@ -992,10 +1023,9 @@ bool q_resolveOpenSslSymbols()
41
     RESOLVEFUNC(OPENSSL_add_all_algorithms_conf)
130
     RESOLVEFUNC(OPENSSL_add_all_algorithms_conf)
42
     RESOLVEFUNC(SSLeay)
131
     RESOLVEFUNC(SSLeay)
43
 
132
 
Lines 49-55 Link Here
49
         delete libs.first;
138
         delete libs.first;
50
         delete libs.second;
139
         delete libs.second;
51
         qCWarning(lcSsl, "Incompatible version of OpenSSL");
140
         qCWarning(lcSsl, "Incompatible version of OpenSSL");
52
@@ -994,8 +996,12 @@ bool q_resolveOpenSslSymbols()
141
@@ -1007,8 +1037,12 @@ bool q_resolveOpenSslSymbols()
53
 
142
 
54
 #ifndef OPENSSL_NO_EC
143
 #ifndef OPENSSL_NO_EC
55
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
144
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
Lines 63-74 Link Here
63
 #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
152
 #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
64
 #endif // OPENSSL_NO_EC
153
 #endif // OPENSSL_NO_EC
65
 
154
 
66
@@ -1017,7 +1023,7 @@ bool q_resolveOpenSslSymbols()
155
@@ -1122,7 +1156,7 @@ bool q_resolveOpenSslSymbols()
67
     RESOLVEFUNC(EC_GROUP_get_degree)
156
     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
68
 #endif
157
     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
69
     RESOLVEFUNC(BN_num_bits)
158
     RESOLVEFUNC(SSL_CTX_get_cert_store);
70
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
159
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
71
+#if !defined(BN_is_word)
160
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
72
     RESOLVEFUNC(BN_is_word)
161
     RESOLVEFUNC(SSL_CONF_CTX_new);
73
 #endif
162
     RESOLVEFUNC(SSL_CONF_CTX_free);
74
     RESOLVEFUNC(BN_mod_word)
163
     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
(-)net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h (-12 / +11 lines)
Lines 1-16 Link Here
1
Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp.
1
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2018-06-15 07:29:31 UTC
2
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2017-11-30 13:49:46 UTC
3
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
2
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
4
@@ -232,7 +232,7 @@ BIO *q_BIO_new_mem_buf(void *a, int b);
3
@@ -356,7 +356,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a,
5
 int q_BIO_read(BIO *a, void *b, int c);
4
 int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
6
 Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c);
5
 int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
7
 int q_BN_num_bits(const BIGNUM *a);
6
 X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
8
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
7
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
9
+#if !defined(BN_is_word)
8
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
10
 int q_BN_is_word(BIGNUM *a, BN_ULONG w);
9
 SSL_CONF_CTX *q_SSL_CONF_CTX_new();
11
 #else
10
 void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
12
 // BN_is_word is implemented purely as a
11
 void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
13
@@ -454,6 +454,9 @@ void q_EC_KEY_free(EC_KEY *ecdh);
12
@@ -468,6 +468,9 @@ void q_EC_KEY_free(EC_KEY *ecdh);
14
 size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
13
 size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
15
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
14
 #if OPENSSL_VERSION_NUMBER >= 0x10002000L
16
 int q_EC_curve_nist2nid(const char *name);
15
 int q_EC_curve_nist2nid(const char *name);
(-)net/qt5-network/pkg-plist (+2 lines)
Lines 50-55 Link Here
50
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkdiskcache_p.h
50
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkdiskcache_p.h
51
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkfile_p.h
51
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkfile_p.h
52
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_p.h
52
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_p.h
53
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_uikit_p.h
54
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkinterface_unix_p.h
53
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreply_p.h
55
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreply_p.h
54
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplydataimpl_p.h
56
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplydataimpl_p.h
55
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyfileimpl_p.h
57
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qnetworkreplyfileimpl_p.h

Return to bug 230884