summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2020-07-04 09:07:02 +0000
committerjsing <>2020-07-04 09:07:02 +0000
commitc09004d5abb7461b1cd8e9ffd0624c1185603fba (patch)
tree31778bb31d2ba5ba0f13d898d3bb3a30960a5811
parent15d9bc7df47f8e37cb62f50b3acc7d9e356f4fbc (diff)
downloadopenbsd-c09004d5abb7461b1cd8e9ffd0624c1185603fba.tar.gz
openbsd-c09004d5abb7461b1cd8e9ffd0624c1185603fba.tar.bz2
openbsd-c09004d5abb7461b1cd8e9ffd0624c1185603fba.zip
Add a missing circular_init() call in the TLS ordering test.
This makes the regress work correctly again - this was previously masked by the fact that tls_close() (and hence SSL_shutdown()) was draining the circular buffer, whereas now we're leaving data behind from a previous test, resulting in the ordering test failing.
-rw-r--r--src/regress/lib/libtls/tls/tlstest.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/regress/lib/libtls/tls/tlstest.c b/src/regress/lib/libtls/tls/tlstest.c
index c386e91610..047f9054f8 100644
--- a/src/regress/lib/libtls/tls/tlstest.c
+++ b/src/regress/lib/libtls/tls/tlstest.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tlstest.c,v 1.11 2020/05/13 17:57:27 jsing Exp $ */ 1/* $OpenBSD: tlstest.c,v 1.12 2020/07/04 09:07:02 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -438,6 +438,8 @@ do_tls_ordering_tests(void)
438 goto done; 438 goto done;
439 } 439 }
440 440
441 circular_init();
442
441 if (tls_accept_cbs(server, &server_cctx, server_read, server_write, 443 if (tls_accept_cbs(server, &server_cctx, server_read, server_write,
442 NULL) == -1) 444 NULL) == -1)
443 errx(1, "failed to accept: %s", tls_error(server)); 445 errx(1, "failed to accept: %s", tls_error(server));