Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/qt4/patches/qt-4.8.7-disable-sslv3.patch

    Annotation of /trunk/qt4/patches/qt-4.8.7-disable-sslv3.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2917 - (hide annotations) (download)
    Wed May 17 09:04:25 2017 UTC (7 years, 1 month ago) by niro
    File size: 2653 byte(s) 
    -fixed patches
    1 niro 2917 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
    2     --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp 2015-05-07 16:14:44.000000000 +0200
    3     +++ qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl.cpp 2016-03-04 11:29:17.119300898 +0100
    4     @@ -267,7 +267,11 @@
    5 niro 2910 #endif
    6     break;
    7     case QSsl::SslV3:
    8 niro 2917 +#ifndef OPENSSL_NO_SSL3
    9 niro 2910 ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
    10 niro 2917 +#else
    11     + ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
    12     +#endif
    13 niro 2910 break;
    14     case QSsl::SecureProtocols: // SslV2 will be disabled below
    15     case QSsl::TlsV1SslV3: // SslV2 will be disabled below
    16     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
    17 niro 2917 --- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2015-05-07 16:14:44.000000000 +0200
    18     +++ qt-everywhere-opensource-src-4.8.7-nossl3/src/network/ssl/qsslsocket_openssl_symbols.cpp 2016-03-04 11:28:52.806050135 +0100
    19     @@ -228,13 +228,17 @@
    20 niro 2910 #ifndef OPENSSL_NO_SSL2
    21     DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
    22     #endif
    23 niro 2917 +#ifndef OPENSSL_NO_SSL3
    24 niro 2910 DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
    25 niro 2917 +#endif
    26 niro 2910 DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
    27     DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
    28     #ifndef OPENSSL_NO_SSL2
    29     DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
    30     #endif
    31 niro 2917 +#ifndef OPENSSL_NO_SSL3
    32 niro 2910 DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
    33 niro 2917 +#endif
    34 niro 2910 DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
    35     DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
    36     #else
    37 niro 2917 @@ -822,13 +826,17 @@
    38 niro 2910 #ifndef OPENSSL_NO_SSL2
    39     RESOLVEFUNC(SSLv2_client_method)
    40     #endif
    41 niro 2917 +#ifndef OPENSSL_NO_SSL3
    42 niro 2910 RESOLVEFUNC(SSLv3_client_method)
    43 niro 2917 +#endif
    44 niro 2910 RESOLVEFUNC(SSLv23_client_method)
    45     RESOLVEFUNC(TLSv1_client_method)
    46     #ifndef OPENSSL_NO_SSL2
    47     RESOLVEFUNC(SSLv2_server_method)
    48     #endif
    49 niro 2917 +#ifndef OPENSSL_NO_SSL3
    50 niro 2910 RESOLVEFUNC(SSLv3_server_method)
    51 niro 2917 +#endif
    52 niro 2910 RESOLVEFUNC(SSLv23_server_method)
    53     RESOLVEFUNC(TLSv1_server_method)
    54     RESOLVEFUNC(X509_NAME_entry_count)