diff options
author | cheloha <> | 2018-08-28 14:30:48 +0000 |
---|---|---|
committer | cheloha <> | 2018-08-28 14:30:48 +0000 |
commit | 560257196f5404f7e5eef927cee959ed3dc4023b (patch) | |
tree | 1f71b6953e6686a6db8256b0acfc4ed754ba3cc8 /src/usr.bin | |
parent | 3db08ad9da0d956ac3e0fbe2ee2be51a1bed9218 (diff) | |
download | openbsd-560257196f5404f7e5eef927cee959ed3dc4023b.tar.gz openbsd-560257196f5404f7e5eef927cee959ed3dc4023b.tar.bz2 openbsd-560257196f5404f7e5eef927cee959ed3dc4023b.zip |
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@
Diffstat (limited to 'src/usr.bin')
-rw-r--r-- | src/usr.bin/openssl/s_time.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/s_time.c b/src/usr.bin/openssl/s_time.c index 91a6855d88..793e50e4be 100644 --- a/src/usr.bin/openssl/s_time.c +++ b/src/usr.bin/openssl/s_time.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s_time.c,v 1.30 2018/08/28 02:14:22 cheloha Exp $ */ | 1 | /* $OpenBSD: s_time.c,v 1.31 2018/08/28 14:30:48 cheloha Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -242,7 +242,7 @@ s_time_main(int argc, char **argv) | |||
242 | } | 242 | } |
243 | } | 243 | } |
244 | 244 | ||
245 | s_time_meth = SSLv23_client_method(); | 245 | s_time_meth = TLS_client_method(); |
246 | 246 | ||
247 | verify_depth = 0; | 247 | verify_depth = 0; |
248 | 248 | ||
@@ -435,10 +435,6 @@ benchmark(int reuse_session) | |||
435 | ver = SSL_version(scon); | 435 | ver = SSL_version(scon); |
436 | if (ver == TLS1_VERSION) | 436 | if (ver == TLS1_VERSION) |
437 | ver = 't'; | 437 | ver = 't'; |
438 | else if (ver == SSL3_VERSION) | ||
439 | ver = '3'; | ||
440 | else if (ver == SSL2_VERSION) | ||
441 | ver = '2'; | ||
442 | else | 438 | else |
443 | ver = '*'; | 439 | ver = '*'; |
444 | } | 440 | } |