diff options
Diffstat (limited to 'regress/lib/libssl/ssl/ssltest.c')
| -rw-r--r-- | regress/lib/libssl/ssl/ssltest.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/regress/lib/libssl/ssl/ssltest.c b/regress/lib/libssl/ssl/ssltest.c index 5b03e0e0b8e..712e2ca1848 100644 --- a/regress/lib/libssl/ssl/ssltest.c +++ b/regress/lib/libssl/ssl/ssltest.c @@ -431,7 +431,6 @@ sv_usage(void) fprintf(stderr, " -no_dhe - disable DHE\n"); fprintf(stderr, " -no_ecdhe - disable ECDHE\n"); fprintf(stderr, " -dtls1 - use DTLSv1\n"); - fprintf(stderr, " -ssl3 - use SSLv3\n"); fprintf(stderr, " -tls1 - use TLSv1\n"); fprintf(stderr, " -CApath arg - PEM format directory of CA's\n"); fprintf(stderr, " -CAfile arg - PEM format file of CA's\n"); @@ -550,7 +549,7 @@ main(int argc, char *argv[]) int badop = 0; int bio_pair = 0; int force = 0; - int tls1 = 0, ssl3 = 0, dtls1 = 0, ret = 1; + int tls1 = 0, dtls1 = 0, ret = 1; int client_auth = 0; int server_auth = 0, i; struct app_verify_arg app_verify_arg = @@ -618,8 +617,6 @@ main(int argc, char *argv[]) no_ecdhe = 1; else if (strcmp(*argv, "-dtls1") == 0) dtls1 = 1; - else if (strcmp(*argv, "-ssl3") == 0) - ssl3 = 1; else if (strcmp(*argv, "-tls1") == 0) tls1 = 1; else if (strncmp(*argv, "-num", 4) == 0) { @@ -733,12 +730,12 @@ bad: goto end; } - if (!dtls1 && !ssl3 && !tls1 && + if (!dtls1 && !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, -ssl3, -tls1, -reuse\n" + "or add one of -dtls1, -tls1, -reuse\n" "to avoid protocol mismatch.\n"); exit(1); } @@ -761,8 +758,6 @@ bad: meth = DTLSv1_method(); else if (tls1) meth = TLSv1_method(); - else if (ssl3) - meth = SSLv3_method(); else meth = SSLv23_method(); @@ -2169,20 +2164,6 @@ do_test_cipherlist(void) const SSL_METHOD *meth; const SSL_CIPHER *ci, *tci = NULL; - fprintf(stderr, "testing SSLv3 cipher list order: "); - meth = SSLv3_method(); - tci = NULL; - while ((ci = meth->get_cipher(i++)) != NULL) { - if (tci != NULL) { - if (ci->id >= tci->id) { - fprintf(stderr, - "failed %lx vs. %lx\n", ci->id, tci->id); - return 0; - } - } - tci = ci; - } - fprintf(stderr, "ok\n"); fprintf(stderr, "testing TLSv1 cipher list order: "); meth = TLSv1_method(); tci = NULL; |