1 |
commit: 568a924b3f62d0acff635b2379aedd85ebbc0b99 |
2 |
Author: Stefan Strogin <steils <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 27 08:26:20 2020 +0000 |
4 |
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 28 05:50:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568a924b |
7 |
|
8 |
dev-qt/qtnetwork: add patch for LibreSSL |
9 |
|
10 |
Closes: https://bugs.gentoo.org/562050 |
11 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
12 |
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org> |
13 |
|
14 |
.../files/qtnetwork-5.15.0-libressl.patch | 340 +++++++++++++++++++++ |
15 |
dev-qt/qtnetwork/qtnetwork-5.15.0.ebuild | 9 +- |
16 |
2 files changed, 347 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..d0a4796639b |
21 |
--- /dev/null |
22 |
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.0-libressl.patch |
23 |
@@ -0,0 +1,340 @@ |
24 |
+From 4774fcd31a49f6f193bf10990601ad494fab2013 Mon Sep 17 00:00:00 2001 |
25 |
+From: Stefan Strogin <steils@g.o> |
26 |
+Date: Wed, 5 Feb 2020 03:49:35 +0200 |
27 |
+Subject: [PATCH] QSslSocket - add LibreSSL support |
28 |
+ |
29 |
+Upstream-Status: Inappropriate |
30 |
+[Upstream is not willing to accept any patches for LibreSSL support] |
31 |
+Signed-off-by: Stefan Strogin <steils@g.o> |
32 |
+--- |
33 |
+ src/network/ssl/qsslcertificate_openssl.cpp | 2 +- |
34 |
+ src/network/ssl/qsslcontext_openssl.cpp | 17 +++++++- |
35 |
+ src/network/ssl/qsslcontext_openssl_p.h | 7 +++ |
36 |
+ src/network/ssl/qsslsocket_openssl.cpp | 2 +- |
37 |
+ .../ssl/qsslsocket_openssl_symbols.cpp | 25 +++++++++++ |
38 |
+ .../ssl/qsslsocket_openssl_symbols_p.h | 43 +++++++++++++++++++ |
39 |
+ 6 files changed, 93 insertions(+), 3 deletions(-) |
40 |
+ |
41 |
+diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp |
42 |
+index 6f1fb26a..eba5a729 100644 |
43 |
+--- a/src/network/ssl/qsslcertificate_openssl.cpp |
44 |
++++ b/src/network/ssl/qsslcertificate_openssl.cpp |
45 |
+@@ -658,7 +658,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name) |
46 |
+ unsigned char *data = nullptr; |
47 |
+ int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); |
48 |
+ info.insert(name, QString::fromUtf8((char*)data, size)); |
49 |
+-#if QT_CONFIG(opensslv11) |
50 |
++#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) |
51 |
+ q_CRYPTO_free(data, nullptr, 0); |
52 |
+ #else |
53 |
+ q_CRYPTO_free(data); |
54 |
+diff --git a/src/network/ssl/qsslcontext_openssl.cpp b/src/network/ssl/qsslcontext_openssl.cpp |
55 |
+index 0aa8a4f4..f161af8a 100644 |
56 |
+--- a/src/network/ssl/qsslcontext_openssl.cpp |
57 |
++++ b/src/network/ssl/qsslcontext_openssl.cpp |
58 |
+@@ -397,16 +397,28 @@ init_context: |
59 |
+ maxVersion = DTLS1_VERSION; |
60 |
+ break; |
61 |
+ case QSsl::DtlsV1_0OrLater: |
62 |
++#ifdef DTLS_MAX_VERSION |
63 |
+ minVersion = DTLS1_VERSION; |
64 |
+ maxVersion = DTLS_MAX_VERSION; |
65 |
++#else |
66 |
++ Q_UNREACHABLE(); |
67 |
++#endif // DTLS_MAX_VERSION |
68 |
+ break; |
69 |
+ case QSsl::DtlsV1_2: |
70 |
++#ifdef DTLS1_2_VERSION |
71 |
+ minVersion = DTLS1_2_VERSION; |
72 |
+ maxVersion = DTLS1_2_VERSION; |
73 |
++#else |
74 |
++ Q_UNREACHABLE(); |
75 |
++#endif // DTLS1_2_VERSION |
76 |
+ break; |
77 |
+ case QSsl::DtlsV1_2OrLater: |
78 |
++#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION) |
79 |
+ minVersion = DTLS1_2_VERSION; |
80 |
+ maxVersion = DTLS_MAX_VERSION; |
81 |
++#else |
82 |
++ Q_UNREACHABLE(); |
83 |
++#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION |
84 |
+ break; |
85 |
+ case QSsl::TlsV1_3OrLater: |
86 |
+ #ifdef TLS1_3_VERSION |
87 |
+@@ -696,6 +708,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
88 |
+ } |
89 |
+ #endif // ocsp |
90 |
+ |
91 |
++#ifndef LIBRESSL_VERSION_NUMBER |
92 |
+ QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); |
93 |
+ if (cctx) { |
94 |
+ q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); |
95 |
+@@ -742,7 +755,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
96 |
+ sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); |
97 |
+ sslContext->errorCode = QSslError::UnspecifiedError; |
98 |
+ } |
99 |
+- } else { |
100 |
++ } else |
101 |
++#endif // LIBRESSL_VERSION_NUMBER |
102 |
++ { |
103 |
+ sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed")); |
104 |
+ sslContext->errorCode = QSslError::UnspecifiedError; |
105 |
+ } |
106 |
+diff --git a/src/network/ssl/qsslcontext_openssl_p.h b/src/network/ssl/qsslcontext_openssl_p.h |
107 |
+index 70cb97aa..01a61cf5 100644 |
108 |
+--- a/src/network/ssl/qsslcontext_openssl_p.h |
109 |
++++ b/src/network/ssl/qsslcontext_openssl_p.h |
110 |
+@@ -61,6 +61,13 @@ |
111 |
+ |
112 |
+ QT_BEGIN_NAMESPACE |
113 |
+ |
114 |
++#ifndef DTLS_ANY_VERSION |
115 |
++#define DTLS_ANY_VERSION 0x1FFFF |
116 |
++#endif |
117 |
++#ifndef TLS_ANY_VERSION |
118 |
++#define TLS_ANY_VERSION 0x10000 |
119 |
++#endif |
120 |
++ |
121 |
+ #ifndef QT_NO_SSL |
122 |
+ |
123 |
+ class QSslContextPrivate; |
124 |
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp |
125 |
+index 4be27aff..1f33911e 100644 |
126 |
+--- a/src/network/ssl/qsslsocket_openssl.cpp |
127 |
++++ b/src/network/ssl/qsslsocket_openssl.cpp |
128 |
+@@ -598,7 +598,7 @@ bool QSslSocketBackendPrivate::initSslContext() |
129 |
+ else if (mode == QSslSocket::SslServerMode) |
130 |
+ q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); |
131 |
+ |
132 |
+-#if OPENSSL_VERSION_NUMBER >= 0x10101006L |
133 |
++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) |
134 |
+ // Set the client callback for TLSv1.3 PSK |
135 |
+ if (mode == QSslSocket::SslClientMode |
136 |
+ && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { |
137 |
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
138 |
+index 71a268ae..8a43035b 100644 |
139 |
+--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp |
140 |
++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp |
141 |
+@@ -147,6 +147,7 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) |
142 |
+ DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) |
143 |
+ DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) |
144 |
+ DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) |
145 |
++#ifndef LIBRESSL_VERSION_NUMBER |
146 |
+ DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) |
147 |
+ DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) |
148 |
+ DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
149 |
+@@ -154,6 +155,14 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null |
150 |
+ DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) |
151 |
+ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) |
152 |
+ DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) |
153 |
++#else |
154 |
++DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) |
155 |
++DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) |
156 |
++DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) |
157 |
++DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) |
158 |
++DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) |
159 |
++DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return) |
160 |
++#endif // LIBRESSL_VERSION_NUMBER |
161 |
+ DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) |
162 |
+ DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) |
163 |
+ #ifdef TLS1_3_VERSION |
164 |
+@@ -179,7 +188,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver |
165 |
+ DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) |
166 |
+ DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) |
167 |
+ DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) |
168 |
++#ifndef LIBRESSL_VERSION_NUMBER |
169 |
+ DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) |
170 |
++#else |
171 |
++DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) |
172 |
++#endif |
173 |
+ DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) |
174 |
+ DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) |
175 |
+ DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) |
176 |
+@@ -219,7 +232,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, |
177 |
+ ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, |
178 |
+ return 0, return) |
179 |
+ DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) |
180 |
++#ifndef LIBRESSL_VERSION_NUMBER |
181 |
+ DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return) |
182 |
++#endif |
183 |
+ DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) |
184 |
+ DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, |
185 |
+ int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) |
186 |
+@@ -351,12 +366,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - |
187 |
+ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) |
188 |
+ DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) |
189 |
+ DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) |
190 |
++#ifndef LIBRESSL_VERSION_NUMBER |
191 |
+ DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); |
192 |
+ DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); |
193 |
+ DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); |
194 |
+ DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return); |
195 |
+ DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return); |
196 |
+ DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return); |
197 |
++#endif |
198 |
+ DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) |
199 |
+ DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) |
200 |
+ DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) |
201 |
+@@ -833,12 +850,14 @@ bool q_resolveOpenSslSymbols() |
202 |
+ RESOLVEFUNC(EVP_PKEY_up_ref) |
203 |
+ RESOLVEFUNC(EVP_PKEY_base_id) |
204 |
+ RESOLVEFUNC(RSA_bits) |
205 |
++#ifndef LIBRESSL_VERSION_NUMBER |
206 |
+ RESOLVEFUNC(OPENSSL_sk_new_null) |
207 |
+ RESOLVEFUNC(OPENSSL_sk_push) |
208 |
+ RESOLVEFUNC(OPENSSL_sk_free) |
209 |
+ RESOLVEFUNC(OPENSSL_sk_num) |
210 |
+ RESOLVEFUNC(OPENSSL_sk_pop_free) |
211 |
+ RESOLVEFUNC(OPENSSL_sk_value) |
212 |
++#endif |
213 |
+ RESOLVEFUNC(DH_get0_pqg) |
214 |
+ RESOLVEFUNC(SSL_CTX_set_options) |
215 |
+ |
216 |
+@@ -880,7 +899,9 @@ bool q_resolveOpenSslSymbols() |
217 |
+ |
218 |
+ RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) |
219 |
+ RESOLVEFUNC(DH_bits) |
220 |
++#ifndef LIBRESSL_VERSION_NUMBER |
221 |
+ RESOLVEFUNC(DSA_bits) |
222 |
++#endif |
223 |
+ |
224 |
+ #if QT_CONFIG(dtls) |
225 |
+ RESOLVEFUNC(DTLSv1_listen) |
226 |
+@@ -910,7 +931,9 @@ bool q_resolveOpenSslSymbols() |
227 |
+ RESOLVEFUNC(OCSP_check_validity) |
228 |
+ RESOLVEFUNC(OCSP_cert_to_id) |
229 |
+ RESOLVEFUNC(OCSP_id_get0_info) |
230 |
++#ifndef LIBRESSL_VERSION_NUMBER |
231 |
+ RESOLVEFUNC(OCSP_resp_get0_certs) |
232 |
++#endif |
233 |
+ RESOLVEFUNC(OCSP_basic_sign) |
234 |
+ RESOLVEFUNC(OCSP_response_create) |
235 |
+ RESOLVEFUNC(i2d_OCSP_RESPONSE) |
236 |
+@@ -1040,12 +1063,14 @@ bool q_resolveOpenSslSymbols() |
237 |
+ RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) |
238 |
+ RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) |
239 |
+ RESOLVEFUNC(SSL_CTX_get_cert_store); |
240 |
++#ifndef LIBRESSL_VERSION_NUMBER |
241 |
+ RESOLVEFUNC(SSL_CONF_CTX_new); |
242 |
+ RESOLVEFUNC(SSL_CONF_CTX_free); |
243 |
+ RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); |
244 |
+ RESOLVEFUNC(SSL_CONF_CTX_set_flags); |
245 |
+ RESOLVEFUNC(SSL_CONF_CTX_finish); |
246 |
+ RESOLVEFUNC(SSL_CONF_cmd); |
247 |
++#endif |
248 |
+ RESOLVEFUNC(SSL_accept) |
249 |
+ RESOLVEFUNC(SSL_clear) |
250 |
+ RESOLVEFUNC(SSL_connect) |
251 |
+diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
252 |
+index f35e0ba2..30097317 100644 |
253 |
+--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h |
254 |
++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h |
255 |
+@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE |
256 |
+ |
257 |
+ #define DUMMYARG |
258 |
+ |
259 |
++#ifdef LIBRESSL_VERSION_NUMBER |
260 |
++typedef _STACK STACK; |
261 |
++typedef STACK OPENSSL_STACK; |
262 |
++typedef void OPENSSL_INIT_SETTINGS; |
263 |
++typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); |
264 |
++#endif |
265 |
++ |
266 |
+ #if !defined QT_LINKED_OPENSSL |
267 |
+ // **************** Shared declarations ****************** |
268 |
+ // ret func(arg) |
269 |
+@@ -230,17 +237,38 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); |
270 |
+ Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); |
271 |
+ Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); |
272 |
+ |
273 |
++#ifndef LIBRESSL_VERSION_NUMBER |
274 |
+ int q_DSA_bits(DSA *a); |
275 |
++#else |
276 |
++#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) |
277 |
++#endif |
278 |
+ int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); |
279 |
+ Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a); |
280 |
+ int q_EVP_PKEY_base_id(EVP_PKEY *a); |
281 |
+ int q_RSA_bits(RSA *a); |
282 |
++ |
283 |
++#ifndef LIBRESSL_VERSION_NUMBER |
284 |
+ Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); |
285 |
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); |
286 |
+ Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); |
287 |
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); |
288 |
+ Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); |
289 |
+ Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); |
290 |
++#else // LIBRESSL_VERSION_NUMBER |
291 |
++int q_sk_num(STACK *a); |
292 |
++#define q_OPENSSL_sk_num(a) q_sk_num(a) |
293 |
++void q_sk_pop_free(STACK *a, void (*b)(void *)); |
294 |
++#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b) |
295 |
++STACK *q_sk_new_null(); |
296 |
++#define q_OPENSSL_sk_new_null() q_sk_new_null() |
297 |
++void q_sk_push(STACK *st, void *data); |
298 |
++#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data) |
299 |
++void q_sk_free(STACK *a); |
300 |
++#define q_OPENSSL_sk_free q_sk_free |
301 |
++void *q_sk_value(STACK *a, int b); |
302 |
++#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) |
303 |
++#endif // LIBRESSL_VERSION_NUMBER |
304 |
++ |
305 |
+ int q_SSL_session_reused(SSL *a); |
306 |
+ unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); |
307 |
+ int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); |
308 |
+@@ -266,8 +294,13 @@ int q_DH_bits(DH *dh); |
309 |
+ # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ |
310 |
+ | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) |
311 |
+ |
312 |
++#ifndef LIBRESSL_VERSION_NUMBER |
313 |
+ #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) |
314 |
+ #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) |
315 |
++#else |
316 |
++#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) |
317 |
++#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) |
318 |
++#endif // LIBRESSL_VERSION_NUMBER |
319 |
+ |
320 |
+ #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ |
321 |
+ | OPENSSL_INIT_ADD_ALL_DIGESTS \ |
322 |
+@@ -276,7 +309,11 @@ int q_DH_bits(DH *dh); |
323 |
+ | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) |
324 |
+ |
325 |
+ int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); |
326 |
++#ifndef LIBRESSL_VERSION_NUMBER |
327 |
+ void q_CRYPTO_free(void *str, const char *file, int line); |
328 |
++#else |
329 |
++void q_CRYPTO_free(void *a); |
330 |
++#endif |
331 |
+ |
332 |
+ long q_OpenSSL_version_num(); |
333 |
+ const char *q_OpenSSL_version(int type); |
334 |
+@@ -494,12 +531,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); |
335 |
+ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); |
336 |
+ int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); |
337 |
+ X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); |
338 |
++#ifndef LIBRESSL_VERSION_NUMBER |
339 |
+ SSL_CONF_CTX *q_SSL_CONF_CTX_new(); |
340 |
+ void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); |
341 |
+ void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); |
342 |
+ unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b); |
343 |
+ int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a); |
344 |
+ int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); |
345 |
++#endif |
346 |
+ void q_SSL_free(SSL *a); |
347 |
+ STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); |
348 |
+ const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); |
349 |
+@@ -715,7 +754,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n |
350 |
+ int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, |
351 |
+ ASN1_INTEGER **pserial, OCSP_CERTID *cid); |
352 |
+ |
353 |
++#ifndef LIBRESSL_VERSION_NUMBER |
354 |
+ const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); |
355 |
++#else |
356 |
++#define q_OCSP_resp_get0_certs(bs) ((bs)->certs) |
357 |
++#endif |
358 |
+ Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); |
359 |
+ Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid); |
360 |
+ int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); |
361 |
+-- |
362 |
+2.25.0 |
363 |
+ |
364 |
|
365 |
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.0.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.0.ebuild |
366 |
index 1e8c4106e03..2ff63e0d3c2 100644 |
367 |
--- a/dev-qt/qtnetwork/qtnetwork-5.15.0.ebuild |
368 |
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.0.ebuild |
369 |
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then |
370 |
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
371 |
fi |
372 |
|
373 |
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl" |
374 |
+IUSE="bindist connman gssapi libproxy libressl networkmanager sctp +ssl" |
375 |
|
376 |
DEPEND=" |
377 |
~dev-qt/qtcore-${PV}:5= |
378 |
@@ -21,7 +21,10 @@ DEPEND=" |
379 |
libproxy? ( net-libs/libproxy ) |
380 |
networkmanager? ( ~dev-qt/qtdbus-${PV} ) |
381 |
sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) |
382 |
- ssl? ( dev-libs/openssl:0=[bindist=] ) |
383 |
+ ssl? ( |
384 |
+ !libressl? ( dev-libs/openssl:0=[bindist=] ) |
385 |
+ libressl? ( dev-libs/libressl:0= ) |
386 |
+ ) |
387 |
" |
388 |
RDEPEND="${DEPEND} |
389 |
connman? ( net-misc/connman ) |
390 |
@@ -44,6 +47,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
391 |
:network |
392 |
) |
393 |
|
394 |
+PATCHES=( "${FILESDIR}"/${PN}-5.15.0-libressl.patch ) # Bug 562050, not upstreamable |
395 |
+ |
396 |
pkg_setup() { |
397 |
use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) |
398 |
use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) |