summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2023-07-27 07:08:10 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2023-07-27 07:08:10 +0000
commiteeed7657b91120978a2e2b31d7eacad67ae19e50 (patch)
tree85b44526464e16a60673cf84e875155afa67eeb8
parenteb7562d2414bd113c6c803f24ffc78ae41428357 (diff)
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...
-rw-r--r--regress/lib/libssl/ssl/ssltest.c9
1 files changed, 8 insertions, 1 deletions
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 <sys/types.h>
@@ -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