diff options
author | jsing <> | 2020-07-30 16:57:53 +0000 |
---|---|---|
committer | jsing <> | 2020-07-30 16:57:53 +0000 |
commit | 0973a73b440b32006d33d9c0ce42f83c3f1caff4 (patch) | |
tree | 4be7741fc53a1b698d3a4cacc67297a8fc54a0d4 /src | |
parent | 8ff4976278b8287ec84e713ef782be6f4989ce06 (diff) | |
download | openbsd-0973a73b440b32006d33d9c0ce42f83c3f1caff4.tar.gz openbsd-0973a73b440b32006d33d9c0ce42f83c3f1caff4.tar.bz2 openbsd-0973a73b440b32006d33d9c0ce42f83c3f1caff4.zip |
Have ssl_init_wbio_buffer() push the buffering BIO rather than doing it
ourselves.
Spotted by tb@ during a previous review.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/tls13_legacy.c | 7 |
1 files 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 @@ | |||
1 | /* $OpenBSD: tls13_legacy.c,v 1.11 2020/07/25 17:44:30 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_legacy.c,v 1.12 2020/07/30 16:57:53 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -295,12 +295,9 @@ tls13_use_legacy_stack(struct tls13_ctx *ctx) | |||
295 | return 0; | 295 | return 0; |
296 | if (!ssl3_setup_buffers(s)) | 296 | if (!ssl3_setup_buffers(s)) |
297 | return 0; | 297 | return 0; |
298 | if (!ssl_init_wbio_buffer(s, 0)) | 298 | if (!ssl_init_wbio_buffer(s, 1)) |
299 | return 0; | 299 | return 0; |
300 | 300 | ||
301 | if (s->bbio != s->wbio) | ||
302 | s->wbio = BIO_push(s->bbio, s->wbio); | ||
303 | |||
304 | /* Stash any unprocessed data from the last record. */ | 301 | /* Stash any unprocessed data from the last record. */ |
305 | tls13_record_layer_rbuf(ctx->rl, &cbs); | 302 | tls13_record_layer_rbuf(ctx->rl, &cbs); |
306 | if (CBS_len(&cbs) > 0) { | 303 | if (CBS_len(&cbs) > 0) { |