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