summaryrefslogtreecommitdiff
path: root/src/regress/lib/libssl/ssl/ssltest.c
diff options
context:
space:
mode:
authorjsing <>2014-12-06 13:13:21 +0000
committerjsing <>2014-12-06 13:13:21 +0000
commited70f604ab1caa2ae3105a6ca2366e741deb8732 (patch)
tree5d2d0e076919231e591f3a37d6d33cba7faa8a28 /src/regress/lib/libssl/ssl/ssltest.c
parent5500ba6b0705c88caeb1285690b3b9d3e0b75807 (diff)
downloadopenbsd-ed70f604ab1caa2ae3105a6ca2366e741deb8732.tar.gz
openbsd-ed70f604ab1caa2ae3105a6ca2366e741deb8732.tar.bz2
openbsd-ed70f604ab1caa2ae3105a6ca2366e741deb8732.zip
The -ssl2 flag does nothing - remove the flag and any tests that were
using it.
Diffstat (limited to 'src/regress/lib/libssl/ssl/ssltest.c')
-rw-r--r--src/regress/lib/libssl/ssl/ssltest.c8
1 files changed, 3 insertions, 5 deletions
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[])
431 int badop = 0; 431 int badop = 0;
432 int bio_pair = 0; 432 int bio_pair = 0;
433 int force = 0; 433 int force = 0;
434 int tls1 = 0, ssl2 = 0, ssl3 = 0, dtls1 = 0, ret = 1; 434 int tls1 = 0, ssl3 = 0, dtls1 = 0, ret = 1;
435 int client_auth = 0; 435 int client_auth = 0;
436 int server_auth = 0, i; 436 int server_auth = 0, i;
437 struct app_verify_arg app_verify_arg = 437 struct app_verify_arg app_verify_arg =
@@ -501,8 +501,6 @@ main(int argc, char *argv[])
501 no_ecdhe = 1; 501 no_ecdhe = 1;
502 else if (strcmp(*argv, "-dtls1") == 0) 502 else if (strcmp(*argv, "-dtls1") == 0)
503 dtls1 = 1; 503 dtls1 = 1;
504 else if (strcmp(*argv, "-ssl2") == 0)
505 ssl2 = 1;
506 else if (strcmp(*argv, "-ssl3") == 0) 504 else if (strcmp(*argv, "-ssl3") == 0)
507 ssl3 = 1; 505 ssl3 = 1;
508 else if (strcmp(*argv, "-tls1") == 0) 506 else if (strcmp(*argv, "-tls1") == 0)
@@ -608,12 +606,12 @@ bad:
608 goto end; 606 goto end;
609 } 607 }
610 608
611 if (!dtls1 && !ssl2 && !ssl3 && !tls1 && 609 if (!dtls1 && !ssl3 && !tls1 &&
612 number > 1 && !reuse && !force) { 610 number > 1 && !reuse && !force) {
613 fprintf(stderr, 611 fprintf(stderr,
614 "This case cannot work. Use -f to perform " 612 "This case cannot work. Use -f to perform "
615 "the test anyway (and\n-d to see what happens), " 613 "the test anyway (and\n-d to see what happens), "
616 "or add one of -dtls1, -ssl2, -ssl3, -tls1, -reuse\n" 614 "or add one of -dtls1, -ssl3, -tls1, -reuse\n"
617 "to avoid protocol mismatch.\n"); 615 "to avoid protocol mismatch.\n");
618 exit(1); 616 exit(1);
619 } 617 }