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