Mercurial > vanilla
comparison qt/qtbase/patch-libressl.patch @ 675:c05fa46c5b62
qt/qtbase: initial import, closes #1544
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 31 Jul 2019 20:10:00 +0200 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
674:cff7770ad21a | 675:c05fa46c5b62 |
---|---|
1 --- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2019-07-31 06:50:55.232767785 +0200 | |
2 +++ src/network/ssl/qsslsocket_openssl_symbols_p.h 2019-07-31 06:51:09.872768235 +0200 | |
3 @@ -372,7 +372,7 @@ | |
4 int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); | |
5 int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); | |
6 X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); | |
7 -#if OPENSSL_VERSION_NUMBER >= 0x10002000L | |
8 +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) | |
9 SSL_CONF_CTX *q_SSL_CONF_CTX_new(); | |
10 void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); | |
11 void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); | |
12 --- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2019-07-31 06:54:15.444773935 +0200 | |
13 +++ src/network/ssl/qsslsocket_openssl_symbols.cpp 2019-07-31 07:04:38.576793077 +0200 | |
14 @@ -247,8 +247,8 @@ | |
15 #endif | |
16 DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return nullptr, return) | |
17 DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) | |
18 -DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return nullptr, return) | |
19 -DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) | |
20 +DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return) | |
21 +DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) | |
22 DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) | |
23 DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) | |
24 DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) | |
25 @@ -439,7 +439,7 @@ | |
26 DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) | |
27 DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) | |
28 DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) | |
29 -#if OPENSSL_VERSION_NUMBER >= 0x10002000L | |
30 +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) | |
31 DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); | |
32 DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); | |
33 DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); | |
34 --- src/network/ssl/qsslcontext_openssl.cpp.orig 2019-07-31 07:09:40.280802344 +0200 | |
35 +++ src/network/ssl/qsslcontext_openssl.cpp 2019-07-31 07:10:07.344803176 +0200 | |
36 @@ -265,7 +265,7 @@ | |
37 } | |
38 #endif // ocsp | |
39 | |
40 -#if OPENSSL_VERSION_NUMBER >= 0x10002000L | |
41 +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) | |
42 if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { | |
43 QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); | |
44 if (cctx) { | |
45 --- src/network/ssl/qsslsocket_opensslpre11_symbols_p.h.orig 2019-07-31 07:01:06.704786569 +0200 | |
46 +++ src/network/ssl/qsslsocket_opensslpre11_symbols_p.h 2019-07-31 07:01:36.000787468 +0200 | |
47 @@ -78,8 +78,8 @@ | |
48 unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); | |
49 BIO *q_BIO_new_file(const char *filename, const char *mode); | |
50 void q_ERR_clear_error(); | |
51 -Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); | |
52 -Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); | |
53 +Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); | |
54 +Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); | |
55 int q_CRYPTO_num_locks(); | |
56 void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); | |
57 void q_CRYPTO_set_id_callback(unsigned long (*a)()); | |
58 --- src/network/configure.json.orig 2019-07-31 07:13:36.576809603 +0200 | |
59 +++ src/network/configure.json 2019-07-31 07:13:49.172809990 +0200 | |
60 @@ -167,7 +167,7 @@ | |
61 "test": { | |
62 "include": "openssl/opensslv.h", | |
63 "tail": [ | |
64 - "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L", | |
65 + "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)", | |
66 "# error OpenSSL >= 1.1 is required", | |
67 "#endif" | |
68 ] | |
69 --- src/network/ssl/qsslsocket_openssl.cpp.orig 2019-07-31 09:13:34.409251873 +0000 | |
70 +++ src/network/ssl/qsslsocket_openssl.cpp 2019-07-31 09:13:55.353252517 +0000 | |
71 @@ -604,7 +604,7 @@ | |
72 q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); | |
73 } | |
74 #endif | |
75 -#if OPENSSL_VERSION_NUMBER >= 0x10101006L | |
76 +#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) | |
77 // Set the client callback for TLSv1.3 PSK | |
78 if (mode == QSslSocket::SslClientMode | |
79 && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { |