From ed70f604ab1caa2ae3105a6ca2366e741deb8732 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 6 Dec 2014 13:13:21 +0000
Subject: The -ssl2 flag does nothing - remove the flag and any tests that were
 using it.

---
 src/regress/lib/libssl/ssl/ssltest.c |  8 +++-----
 src/regress/lib/libssl/ssl/testssl   | 30 +-----------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)

(limited to 'src')

diff --git a/src/regress/lib/libssl/ssl/ssltest.c b/src/regress/lib/libssl/ssl/ssltest.c
index 1f7503af51..b1ca0d8c7d 100644
--- a/src/regress/lib/libssl/ssl/ssltest.c
+++ b/src/regress/lib/libssl/ssl/ssltest.c
@@ -431,7 +431,7 @@ main(int argc, char *argv[])
 	int badop = 0;
 	int bio_pair = 0;
 	int force = 0;
-	int tls1 = 0, ssl2 = 0, ssl3 = 0, dtls1 = 0, ret = 1;
+	int tls1 = 0, ssl3 = 0, dtls1 = 0, ret = 1;
 	int client_auth = 0;
 	int server_auth = 0, i;
 	struct app_verify_arg app_verify_arg =
@@ -501,8 +501,6 @@ main(int argc, char *argv[])
 			no_ecdhe = 1;
 		else if (strcmp(*argv, "-dtls1") == 0)
 			dtls1 = 1;
-		else if (strcmp(*argv, "-ssl2") == 0)
-			ssl2 = 1;
 		else if (strcmp(*argv, "-ssl3") == 0)
 			ssl3 = 1;
 		else if (strcmp(*argv, "-tls1") == 0)
@@ -608,12 +606,12 @@ bad:
 		goto end;
 	}
 
-	if (!dtls1 && !ssl2 && !ssl3 && !tls1 &&
+	if (!dtls1 && !ssl3 && !tls1 &&
 	    number > 1 && !reuse && !force) {
 		fprintf(stderr,
 		    "This case cannot work.  Use -f to perform "
 		    "the test anyway (and\n-d to see what happens), "
-		    "or add one of -dtls1, -ssl2, -ssl3, -tls1, -reuse\n"
+		    "or add one of -dtls1, -ssl3, -tls1, -reuse\n"
 		    "to avoid protocol mismatch.\n");
 		exit(1);
 	}
diff --git a/src/regress/lib/libssl/ssl/testssl b/src/regress/lib/libssl/ssl/testssl
index ff63ce1e44..a8ecab263e 100644
--- a/src/regress/lib/libssl/ssl/testssl
+++ b/src/regress/lib/libssl/ssl/testssl
@@ -15,20 +15,6 @@ fi
 
 #############################################################################
 
-echo test sslv2
-$ssltest -ssl2 $extra || exit 1
-
-echo test sslv2 with server authentication
-$ssltest -ssl2 -server_auth $CA $extra || exit 1
-
-if [ $dsa_cert = NO ]; then
-  echo test sslv2 with client authentication
-  $ssltest -ssl2 -client_auth $CA $extra || exit 1
-
-  echo test sslv2 with both client and server authentication
-  $ssltest -ssl2 -server_auth -client_auth $CA $extra || exit 1
-fi
-
 echo test sslv3
 $ssltest -ssl3 $extra || exit 1
 
@@ -53,20 +39,6 @@ $ssltest -client_auth $CA $extra || exit 1
 echo test sslv2/sslv3 with both client and server authentication
 $ssltest -server_auth -client_auth $CA $extra || exit 1
 
-echo test sslv2 via BIO pair
-$ssltest -bio_pair -ssl2 $extra || exit 1
-
-echo test sslv2 with server authentication via BIO pair
-$ssltest -bio_pair -ssl2 -server_auth $CA $extra || exit 1
-
-if [ $dsa_cert = NO ]; then
-  echo test sslv2 with client authentication via BIO pair
-  $ssltest -bio_pair -ssl2 -client_auth $CA $extra || exit 1
-
-  echo test sslv2 with both client and server authentication via BIO pair
-  $ssltest -bio_pair -ssl2 -server_auth -client_auth $CA $extra || exit 1
-fi
-
 echo test sslv3 via BIO pair
 $ssltest -bio_pair -ssl3 $extra || exit 1
 
@@ -103,7 +75,7 @@ echo test sslv2/sslv3 with both client and server authentication via BIO pair an
 $ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1
 
 echo "Testing ciphersuites"
-for protocol in TLSv1.2 SSLv3; do
+for protocol in SSLv3 TLSv1.2; do
   echo "Testing ciphersuites for $protocol"
   for cipher in `$openssl ciphers "RSA+$protocol" | tr ':' ' '`; do
     echo "Testing $cipher"
-- 
cgit v1.2.3-55-g6feb