--- qca-ossl.cpp.orig 2015-04-11 13:33:04.670944149 +0200 +++ qca-ossl.cpp 2015-04-11 13:33:49.918943741 +0200 @@ -5021,44 +5021,6 @@ return QString("SSL3 to be added: %1").arg(cipherID & 0xffff, 0, 16); break; } - } else if (TLS::SSL_v2 == version) { - switch( cipherID & 0xffffff) { - case 0x010080: - // From the Netscape SSL2 Draft Section C.4 (nov 1994) - return QString("SSL_CK_RC4_128_WITH_MD5"); - break; - case 0x020080: - // From the Netscape SSL2 Draft Section C.4 (nov 1994) - return QString("SSL_CK_RC4_128_EXPORT40_WITH_MD5"); - break; - case 0x030080: - // From the Netscape SSL2 Draft Section C.4 (nov 1994) - return QString("SSL_CK_RC2_128_CBC_WITH_MD5"); - break; - case 0x040080: - // From the Netscape SSL2 Draft Section C.4 (nov 1994) - return QString("SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5"); - break; - case 0x050080: - // From the Netscape SSL2 Draft Section C.4 (nov 1994) - return QString("SSL_CK_RC4_128_EXPORT40_WITH_MD5"); - break; - case 0x060040: - // From the Netscape SSL2 Draft Section C.4 (nov 1994) - return QString("SSL_CK_DES_64_CBC_WITH_MD5"); - break; - case 0x0700C0: - // From the Netscape SSL2 Draft Section C.4 (nov 1994) - return QString("SSL_CK_DES_192_EDE3_CBC_WITH_MD5"); - break; - case 0x080080: - // From the openssl source, which says "MS hack" - return QString("SSL_CK_RC4_64_WITH_MD5"); - break; - default: - return QString("SSL2 to be added: %1").arg(cipherID & 0xffffff, 0, 16); - break; - } } else { return QString("Unknown version!"); @@ -5152,9 +5114,6 @@ OpenSSL_add_ssl_algorithms(); SSL_CTX *ctx = 0; switch (version) { - case TLS::SSL_v2: - ctx = SSL_CTX_new(SSLv2_client_method()); - break; case TLS::SSL_v3: ctx = SSL_CTX_new(SSLv3_client_method()); break; @@ -5563,8 +5522,6 @@ sessInfo.version = TLS::TLS_v1; else if (ssl->version == SSL3_VERSION) sessInfo.version = TLS::SSL_v3; - else if (ssl->version == SSL2_VERSION) - sessInfo.version = TLS::SSL_v2; else { qDebug("unexpected version response"); sessInfo.version = TLS::TLS_v1;