wok-current diff qt4/stuff/disable-sslv3.patch @ rev 25698
Fix ntfs-3g receipt
author | Stanislas Leduc <shann@slitaz.org> |
---|---|
date | Tue Apr 16 19:01:01 2024 +0000 (2 months ago) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/qt4/stuff/disable-sslv3.patch Tue Apr 16 19:01:01 2024 +0000 1.3 @@ -0,0 +1,55 @@ 1.4 +diff -u -r qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl.cpp 1.5 +--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp 2015-05-07 16:14:44.000000000 +0200 1.6 ++++ qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl.cpp 2016-03-04 11:29:17.119300898 +0100 1.7 +@@ -267,7 +267,11 @@ 1.8 + #endif 1.9 + break; 1.10 + case QSsl::SslV3: 1.11 ++#ifndef OPENSSL_NO_SSL3 1.12 + ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); 1.13 ++#else 1.14 ++ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error 1.15 ++#endif 1.16 + break; 1.17 + case QSsl::SecureProtocols: // SslV2 will be disabled below 1.18 + case QSsl::TlsV1SslV3: // SslV2 will be disabled below 1.19 +diff -u -r qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl_symbols.cpp 1.20 +--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2015-05-07 16:14:44.000000000 +0200 1.21 ++++ qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl_symbols.cpp 2016-03-04 11:28:52.806050135 +0100 1.22 +@@ -228,13 +228,17 @@ 1.23 + #ifndef OPENSSL_NO_SSL2 1.24 + DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) 1.25 + #endif 1.26 ++#ifndef OPENSSL_NO_SSL3 1.27 + DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) 1.28 ++#endif 1.29 + DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) 1.30 + DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) 1.31 + #ifndef OPENSSL_NO_SSL2 1.32 + DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) 1.33 + #endif 1.34 ++#ifndef OPENSSL_NO_SSL3 1.35 + DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) 1.36 ++#endif 1.37 + DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) 1.38 + DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) 1.39 + #else 1.40 +@@ -822,13 +826,17 @@ 1.41 + #ifndef OPENSSL_NO_SSL2 1.42 + RESOLVEFUNC(SSLv2_client_method) 1.43 + #endif 1.44 ++#ifndef OPENSSL_NO_SSL3 1.45 + RESOLVEFUNC(SSLv3_client_method) 1.46 ++#endif 1.47 + RESOLVEFUNC(SSLv23_client_method) 1.48 + RESOLVEFUNC(TLSv1_client_method) 1.49 + #ifndef OPENSSL_NO_SSL2 1.50 + RESOLVEFUNC(SSLv2_server_method) 1.51 + #endif 1.52 ++#ifndef OPENSSL_NO_SSL3 1.53 + RESOLVEFUNC(SSLv3_server_method) 1.54 ++#endif 1.55 + RESOLVEFUNC(SSLv23_server_method) 1.56 + RESOLVEFUNC(TLSv1_server_method) 1.57 + RESOLVEFUNC(X509_NAME_entry_count) 1.58 +