From 2287d13a721783c23c3036e2df45e2d342fd91bb Mon Sep 17 00:00:00 2001 From: tb Date: Thu, 27 Jul 2023 07:08:09 +0000 Subject: [PATCH] Prepare the ssltest for the upcoming bump This is a hack. The test is in rather poor shape and it is hard to tell whether it still does what it is supposed to be doing. Hopefully somemone will rewrite this in a style that doesn't make me squeal on opening this file... --- regress/lib/libssl/ssl/ssltest.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/regress/lib/libssl/ssl/ssltest.c b/regress/lib/libssl/ssl/ssltest.c index f3966e50542..f50824d242d 100644 --- a/regress/lib/libssl/ssl/ssltest.c +++ b/regress/lib/libssl/ssl/ssltest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssltest.c,v 1.41 2023/07/04 08:47:01 tb Exp $ */ +/* $OpenBSD: ssltest.c,v 1.42 2023/07/27 07:08:09 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -140,6 +140,9 @@ * OTHERWISE. */ +/* XXX - USE_BIOPAIR code needs updating for BIO_n{read,write}{,0} removal. */ +/* #define USE_BIOPAIR */ + #define _BSD_SOURCE 1 /* Or gethostname won't be declared properly on Linux and GNU platforms. */ #include @@ -714,10 +717,12 @@ bad: for (i = 0; i < number; i++) { if (!reuse) SSL_set_session(c_ssl, NULL); +#ifdef USE_BIOPAIR if (bio_pair) ret = doit_biopair(s_ssl, c_ssl, bytes, &s_time, &c_time); else +#endif ret = doit(s_ssl, c_ssl, bytes); } @@ -771,6 +776,7 @@ end: return ret; } +#if USE_BIOPAIR int doit_biopair(SSL *s_ssl, SSL *c_ssl, long count, clock_t *s_time, clock_t *c_time) @@ -1114,6 +1120,7 @@ err: return ret; } +#endif #define W_READ 1 -- 2.20.1