--- sslscan.c.orig 2015-04-11 13:06:59.147958284 +0200 +++ sslscan.c 2015-04-11 13:11:36.099955784 +0200 @@ -54,7 +54,6 @@ #define BUFFERSIZE 1024 #define ssl_all 0 -#define ssl_v2 1 #define ssl_v3 2 #define tls_v1 3 @@ -563,16 +562,7 @@ } if (options->xmlOutput != 0) fprintf(options->xmlOutput, " sslversion=\""); - if (sslCipherPointer->sslMethod == SSLv2_client_method()) - { - if (options->xmlOutput != 0) - fprintf(options->xmlOutput, "SSLv2\" bits=\""); - if (options->pout == true) - printf("SSLv2 || "); - else - printf("SSLv2 "); - } - else if (sslCipherPointer->sslMethod == SSLv3_client_method()) + if (sslCipherPointer->sslMethod == SSLv3_client_method()) { if (options->xmlOutput != 0) fprintf(options->xmlOutput, "SSLv3\" bits=\""); @@ -688,16 +678,7 @@ cipherStatus = SSL_connect(ssl); if (cipherStatus == 1) { - if (sslMethod == SSLv2_client_method()) - { - if (options->xmlOutput != 0) - fprintf(options->xmlOutput, " pout == true) - printf("|| SSLv2 || "); - else - printf(" SSLv2 "); - } - else if (sslMethod == SSLv3_client_method()) + if (sslMethod == SSLv3_client_method()) { if (options->xmlOutput != 0) fprintf(options->xmlOutput, " sslVersion) { case ssl_all: - status = defaultCipher(options, SSLv2_client_method()); - if (status != false) - status = defaultCipher(options, SSLv3_client_method()); + status = defaultCipher(options, SSLv3_client_method()); if (status != false) status = defaultCipher(options, TLSv1_client_method()); break; - case ssl_v2: - status = defaultCipher(options, SSLv2_client_method()); - break; case ssl_v3: status = defaultCipher(options, SSLv3_client_method()); break; @@ -1298,10 +1274,6 @@ options.starttls = true; } - // SSL v2 only... - else if (strcmp("--ssl2", argv[argLoop]) == 0) - options.sslVersion = ssl_v2; - // SSL v3 only... else if (strcmp("--ssl3", argv[argLoop]) == 0) options.sslVersion = ssl_v3; @@ -1379,7 +1351,6 @@ printf(" ports (i.e. host:port).\n"); printf(" %s--no-failed%s List only accepted ciphers (default\n", COL_GREEN, RESET); printf(" is to listing all ciphers).\n"); - printf(" %s--ssl2%s Only check SSLv2 ciphers.\n", COL_GREEN, RESET); printf(" %s--ssl3%s Only check SSLv3 ciphers.\n", COL_GREEN, RESET); printf(" %s--tls1%s Only check TLSv1 ciphers.\n", COL_GREEN, RESET); printf(" %s--pk=%s A file containing the private key or\n", COL_GREEN, RESET); @@ -1415,13 +1386,9 @@ switch (options.sslVersion) { case ssl_all: - populateCipherList(&options, SSLv2_client_method()); populateCipherList(&options, SSLv3_client_method()); populateCipherList(&options, TLSv1_client_method()); break; - case ssl_v2: - populateCipherList(&options, SSLv2_client_method()); - break; case ssl_v3: populateCipherList(&options, SSLv3_client_method()); break;