Mercurial > vanilla
view qt/qtbase/patch-libressl.patch @ 909:feb87679bb7b
graphics/giflib: initial import, closes #2211
author | David Demelier <markand@malikania.fr> |
---|---|
date | Mon, 26 Aug 2019 20:20:00 +0200 |
parents | c05fa46c5b62 |
children |
line wrap: on
line source
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2019-07-31 06:50:55.232767785 +0200 +++ src/network/ssl/qsslsocket_openssl_symbols_p.h 2019-07-31 06:51:09.872768235 +0200 @@ -372,7 +372,7 @@ int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); -#if OPENSSL_VERSION_NUMBER >= 0x10002000L +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) SSL_CONF_CTX *q_SSL_CONF_CTX_new(); void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); --- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2019-07-31 06:54:15.444773935 +0200 +++ src/network/ssl/qsslsocket_openssl_symbols.cpp 2019-07-31 07:04:38.576793077 +0200 @@ -247,8 +247,8 @@ #endif DEFINEFUNC2(BIO *, BIO_new_file, const char *filename, filename, const char *mode, mode, return nullptr, return) DEFINEFUNC(void, ERR_clear_error, DUMMYARG, DUMMYARG, return, DUMMYARG) -DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return nullptr, return) -DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) +DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return nullptr, return) +DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return nullptr, return) DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) @@ -439,7 +439,7 @@ DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) -#if OPENSSL_VERSION_NUMBER >= 0x10002000L +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); --- src/network/ssl/qsslcontext_openssl.cpp.orig 2019-07-31 07:09:40.280802344 +0200 +++ src/network/ssl/qsslcontext_openssl.cpp 2019-07-31 07:10:07.344803176 +0200 @@ -265,7 +265,7 @@ } #endif // ocsp -#if OPENSSL_VERSION_NUMBER >= 0x10002000L +#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); if (cctx) { --- src/network/ssl/qsslsocket_opensslpre11_symbols_p.h.orig 2019-07-31 07:01:06.704786569 +0200 +++ src/network/ssl/qsslsocket_opensslpre11_symbols_p.h 2019-07-31 07:01:36.000787468 +0200 @@ -78,8 +78,8 @@ unsigned char * q_ASN1_STRING_data(ASN1_STRING *a); BIO *q_BIO_new_file(const char *filename, const char *mode); void q_ERR_clear_error(); -Q_AUTOTEST_EXPORT BIO *q_BIO_new(BIO_METHOD *a); -Q_AUTOTEST_EXPORT BIO_METHOD *q_BIO_s_mem(); +Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); +Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); int q_CRYPTO_num_locks(); void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); void q_CRYPTO_set_id_callback(unsigned long (*a)()); --- src/network/configure.json.orig 2019-07-31 07:13:36.576809603 +0200 +++ src/network/configure.json 2019-07-31 07:13:49.172809990 +0200 @@ -167,7 +167,7 @@ "test": { "include": "openssl/opensslv.h", "tail": [ - "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L", + "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)", "# error OpenSSL >= 1.1 is required", "#endif" ] --- src/network/ssl/qsslsocket_openssl.cpp.orig 2019-07-31 09:13:34.409251873 +0000 +++ src/network/ssl/qsslsocket_openssl.cpp 2019-07-31 09:13:55.353252517 +0000 @@ -604,7 +604,7 @@ q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); } #endif -#if OPENSSL_VERSION_NUMBER >= 0x10101006L +#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) // Set the client callback for TLSv1.3 PSK if (mode == QSslSocket::SslClientMode && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {