Mercurial > vanilla

annotate qt/qtbase/patch-libressl.patch @ 682:0d0271636a3d

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