Attachment #436490 for bug #584796

View | Details | Raw Unified | Return to bug 584796
Collapse All | Expand All




#ifndef OPENSSL_NO_SSL2
DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
#endif
#ifndef OPENSSL_NO_SSL3
DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
#endif
DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
#ifndef OPENSSL_NO_SSL2
DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
#endif
#ifndef OPENSSL_NO_SSL3
DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
#endif
DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
#else

#ifndef OPENSSL_NO_SSL2
    RESOLVEFUNC(SSLv2_client_method)
#endif
#ifndef OPENSSL_NO_SSL3
    RESOLVEFUNC(SSLv3_client_method)
#endif
    RESOLVEFUNC(SSLv23_client_method)
    RESOLVEFUNC(TLSv1_client_method)
#ifndef OPENSSL_NO_SSL2
    RESOLVEFUNC(SSLv2_server_method)
#endif
#ifndef OPENSSL_NO_SSL3
    RESOLVEFUNC(SSLv3_server_method)
#endif
    RESOLVEFUNC(SSLv23_server_method)
    RESOLVEFUNC(TLSv1_server_method)
    RESOLVEFUNC(X509_NAME_entry_count)

Lines 263-269 Link Here

(-)src/network/ssl/qsslsocket_openssl.cpp.orig (+4 lines)
263	#endif	263	#endif
264	break;	264	break;
265	case QSsl::SslV3:	265	case QSsl::SslV3:
		266	#ifndef OPENSSL_NO_SSL3
266	ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());	267	ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
		268	#else
		269	ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error
		270	#endif
267	break;	271	break;
268	case QSsl::SecureProtocols: // SslV2 will be disabled below	272	case QSsl::SecureProtocols: // SslV2 will be disabled below
269	case QSsl::TlsV1SslV3: // SslV2 will be disabled below	273	case QSsl::TlsV1SslV3: // SslV2 will be disabled below

Return to bug 584796

Lines 224-236 Link Here

(-)src/network/ssl/qsslsocket_openssl_symbols.cpp.orig (+8 lines)
224	#ifndef OPENSSL_NO_SSL2	224	#ifndef OPENSSL_NO_SSL2
225	DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)	225	DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
226	#endif	226	#endif
		227	#ifndef OPENSSL_NO_SSL3
227	DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)	228	DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
		229	#endif
228	DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)	230	DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
229	DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)	231	DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
230	#ifndef OPENSSL_NO_SSL2	232	#ifndef OPENSSL_NO_SSL2
231	DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)	233	DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
232	#endif	234	#endif
		235	#ifndef OPENSSL_NO_SSL3
233	DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)	236	DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
		237	#endif
234	DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)	238	DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
235	DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)	239	DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
236	#else	240	#else
Lines 818-830 Link Here
818	#ifndef OPENSSL_NO_SSL2	822	#ifndef OPENSSL_NO_SSL2
819	RESOLVEFUNC(SSLv2_client_method)	823	RESOLVEFUNC(SSLv2_client_method)
820	#endif	824	#endif
		825	#ifndef OPENSSL_NO_SSL3
821	RESOLVEFUNC(SSLv3_client_method)	826	RESOLVEFUNC(SSLv3_client_method)
		827	#endif
822	RESOLVEFUNC(SSLv23_client_method)	828	RESOLVEFUNC(SSLv23_client_method)
823	RESOLVEFUNC(TLSv1_client_method)	829	RESOLVEFUNC(TLSv1_client_method)
824	#ifndef OPENSSL_NO_SSL2	830	#ifndef OPENSSL_NO_SSL2
825	RESOLVEFUNC(SSLv2_server_method)	831	RESOLVEFUNC(SSLv2_server_method)
826	#endif	832	#endif
		833	#ifndef OPENSSL_NO_SSL3
827	RESOLVEFUNC(SSLv3_server_method)	834	RESOLVEFUNC(SSLv3_server_method)
		835	#endif
828	RESOLVEFUNC(SSLv23_server_method)	836	RESOLVEFUNC(SSLv23_server_method)
829	RESOLVEFUNC(TLSv1_server_method)	837	RESOLVEFUNC(TLSv1_server_method)
830	RESOLVEFUNC(X509_NAME_entry_count)	838	RESOLVEFUNC(X509_NAME_entry_count)