===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/s_time.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/openssl/s_time.c	2018/08/28 14:30:48	1.31
--- src/usr.bin/openssl/s_time.c	2018/09/17 15:37:35	1.32
***************
*** 1,4 ****
! /* $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.
   *
--- 1,4 ----
! /* $OpenBSD: s_time.c,v 1.32 2018/09/17 15:37:35 cheloha Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 92,97 ****
--- 92,98 ----
  static void s_time_usage(void);
  static int run_test(SSL *);
  static int benchmark(int);
+ static void print_tally_mark(SSL *);
  
  static SSL_CTX *tm_ctx = NULL;
  static const SSL_METHOD *s_time_meth = NULL;
***************
*** 393,398 ****
--- 394,417 ----
  	return 1;
  }
  
+ static void
+ print_tally_mark(SSL *scon)
+ {
+ 	int ver;
+ 
+ 	if (SSL_session_reused(scon))
+ 		ver = 'r';
+ 	else {
+ 		ver = SSL_version(scon);
+ 		if (ver == TLS1_VERSION)
+ 			ver = 't';
+ 		else
+ 			ver = '*';
+ 	}
+ 	fputc(ver, stdout);
+ 	fflush(stdout);
+ }
+ 
  static int
  benchmark(int reuse_session)
  {
***************
*** 400,406 ****
  	int nConn = 0;
  	SSL *scon = NULL;
  	int ret = 1;
- 	int ver;
  
  	if (reuse_session) {
  		/* Get an SSL object so we can reuse the session id */
--- 419,424 ----
***************
*** 429,446 ****
  		if (!run_test(scon))
  			goto end;
  		nConn += 1;
! 		if (SSL_session_reused(scon))
! 			ver = 'r';
! 		else {
! 			ver = SSL_version(scon);
! 			if (ver == TLS1_VERSION)
! 				ver = 't';
! 			else
! 				ver = '*';
! 		}
! 		fputc(ver, stdout);
! 		fflush(stdout);
! 
  		if (!reuse_session) {
  			SSL_free(scon);
  			scon = NULL;
--- 447,453 ----
  		if (!run_test(scon))
  			goto end;
  		nConn += 1;
! 		print_tally_mark(scon);
  		if (!reuse_session) {
  			SSL_free(scon);
  			scon = NULL;