-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi,
attached is a patch which in theory might fix this. However, I don't have an openssl version with SSLv2 disabled and thus can't properly verify this. Could someone test this patch, please? Cheers, Uli - -- The Angels have the phone box! -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAEBCAAGBQJNoBhoAAoJECLkKOvLj8sGOHsH/A/Mejai9SkXBfqE4YXwzeiM 5pVSxSkKmIUZx9OuoD3hpcYLbHktPyyILSNv6Nln4r6viMebg4MEqF+4csSI9XPG w1UMUjxLUn1JQfdGQR1H5ppQHX5IBZ2YFudpCFrrH2/Xx+PpkpEUctUwGhpiw+Vu KyPF2/ECcHv4LzI8HLnJIUQ9rbfucVgv3StoPA9PVxODWojSQ0xAibA8pl54mIPA STl8G3Ml6rS7z1wcB1hySVg+QSrmaPW4JgHH9Hp4kQVHexNXvO6RzFPFTjeR6+fJ PhzXwJqEPck2UfhWkrN+lEp3qPrilN1DC//kb0GMQXQ0rwb+cf1vbI4AVMC1YLE= =ipx5 -----END PGP SIGNATURE-----
diff --git a/Csocket.cpp b/Csocket.cpp
index 2dab124..33569bf 100644
--- a/Csocket.cpp
+++ b/Csocket.cpp
@@ -1109,15 +1109,6 @@ bool Csock::SSLClientSetup()
switch( m_iMethod )
{
- case SSL2:
- m_ssl_ctx = SSL_CTX_new ( SSLv2_client_method() );
- if ( !m_ssl_ctx )
- {
- CS_DEBUG( "WARNING: MakeConnection .... SSLv2_client_method failed!" );
- return( false );
- }
- break;
-
case SSL3:
m_ssl_ctx = SSL_CTX_new ( SSLv3_client_method() );
if ( !m_ssl_ctx )
@@ -1134,6 +1125,17 @@ bool Csock::SSLClientSetup()
return( false );
}
break;
+ case SSL2:
+#ifndef OPENSSL_NO_SSLV2
+ m_ssl_ctx = SSL_CTX_new ( SSLv2_client_method() );
+ if ( !m_ssl_ctx )
+ {
+ CS_DEBUG( "WARNING: MakeConnection .... SSLv2_client_method failed!" );
+ return( false );
+ }
+ break;
+#endif
+
case SSL23:
default:
m_ssl_ctx = SSL_CTX_new ( SSLv23_client_method() );
@@ -1204,15 +1206,6 @@ bool Csock::SSLServerSetup()
switch( m_iMethod )
{
- case SSL2:
- m_ssl_ctx = SSL_CTX_new ( SSLv2_server_method() );
- if ( !m_ssl_ctx )
- {
- CS_DEBUG( "WARNING: MakeConnection .... SSLv2_server_method failed!" );
- return( false );
- }
- break;
-
case SSL3:
m_ssl_ctx = SSL_CTX_new ( SSLv3_server_method() );
if ( !m_ssl_ctx )
@@ -1231,6 +1224,17 @@ bool Csock::SSLServerSetup()
}
break;
+ case SSL2:
+#ifndef OPENSSL_NO_SSLV2
+ m_ssl_ctx = SSL_CTX_new ( SSLv2_server_method() );
+ if ( !m_ssl_ctx )
+ {
+ CS_DEBUG( "WARNING: MakeConnection .... SSLv2_server_method failed!" );
+ return( false );
+ }
+ break;
+#endif
+
case SSL23:
default:
m_ssl_ctx = SSL_CTX_new ( SSLv23_server_method() );
csocket_openssl_no_sslv2.patch.sig
Description: Binary data
