From 0973a73b440b32006d33d9c0ce42f83c3f1caff4 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 30 Jul 2020 16:57:53 +0000
Subject: Have ssl_init_wbio_buffer() push the buffering BIO rather than doing
it ourselves.
Spotted by tb@ during a previous review.
---
src/lib/libssl/tls13_legacy.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/lib/libssl/tls13_legacy.c b/src/lib/libssl/tls13_legacy.c
index 3feb143183..39d7f0b3ed 100644
--- a/src/lib/libssl/tls13_legacy.c
+++ b/src/lib/libssl/tls13_legacy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_legacy.c,v 1.11 2020/07/25 17:44:30 jsing Exp $ */
+/* $OpenBSD: tls13_legacy.c,v 1.12 2020/07/30 16:57:53 jsing Exp $ */
/*
* Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
*
@@ -295,12 +295,9 @@ tls13_use_legacy_stack(struct tls13_ctx *ctx)
return 0;
if (!ssl3_setup_buffers(s))
return 0;
- if (!ssl_init_wbio_buffer(s, 0))
+ if (!ssl_init_wbio_buffer(s, 1))
return 0;
- if (s->bbio != s->wbio)
- s->wbio = BIO_push(s->bbio, s->wbio);
-
/* Stash any unprocessed data from the last record. */
tls13_record_layer_rbuf(ctx->rl, &cbs);
if (CBS_len(&cbs) > 0) {
--
cgit v1.2.3-55-g6feb