Drop SSLv2, SSLv3 support.
authorcheloha <cheloha@openbsd.org>
Tue, 28 Aug 2018 14:30:48 +0000 (14:30 +0000)
committercheloha <cheloha@openbsd.org>
Tue, 28 Aug 2018 14:30:48 +0000 (14:30 +0000)
No need to check for SSLv2/3 sessions when printing the tally mark.
Also do SSLv23_client_method -> TLS_client_method.

ok jsing@

usr.bin/openssl/s_time.c

index 91a6855..793e50e 100644 (file)
@@ -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 = '*';
                }