summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcheloha <cheloha@cvs.openbsd.org>2018-08-28 14:30:49 +0000
committercheloha <cheloha@cvs.openbsd.org>2018-08-28 14:30:49 +0000
commitd217ce25e4d00cfe24084a832ee88ced2533e308 (patch)
tree9d3a4c77747f47722936ec3296b51f52802ec179
parent45d1c2edb1f8ab31cc7efba5be97f031cbb70475 (diff)
Drop SSLv2, SSLv3 support.
No need to check for SSLv2/3 sessions when printing the tally mark. Also do SSLv23_client_method -> TLS_client_method. ok jsing@
-rw-r--r--usr.bin/openssl/s_time.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/openssl/s_time.c b/usr.bin/openssl/s_time.c
index 91a6855d886..793e50e4be7 100644
--- a/usr.bin/openssl/s_time.c
+++ b/usr.bin/openssl/s_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_time.c,v 1.30 2018/08/28 02:14:22 cheloha Exp $ */
+/* $OpenBSD: s_time.c,v 1.31 2018/08/28 14:30:48 cheloha Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -242,7 +242,7 @@ s_time_main(int argc, char **argv)
}
}
- s_time_meth = SSLv23_client_method();
+ s_time_meth = TLS_client_method();
verify_depth = 0;
@@ -435,10 +435,6 @@ benchmark(int reuse_session)
ver = SSL_version(scon);
if (ver == TLS1_VERSION)
ver = 't';
- else if (ver == SSL3_VERSION)
- ver = '3';
- else if (ver == SSL2_VERSION)
- ver = '2';
else
ver = '*';
}