summaryrefslogtreecommitdiff
path: root/src/lib/libssl/tls13_handshake.c
diff options
context:
space:
mode:
authorjsing <>2019-02-28 17:56:43 +0000
committerjsing <>2019-02-28 17:56:43 +0000
commitc033d8dd5f1b51daaea294f6d345521ac6566588 (patch)
tree5afffe228b3a0a9a1724ae29407d33698377ad48 /src/lib/libssl/tls13_handshake.c
parentfff434b2b23e8a074d741e819b9a91ddac0d4c9c (diff)
downloadopenbsd-c033d8dd5f1b51daaea294f6d345521ac6566588.tar.gz
openbsd-c033d8dd5f1b51daaea294f6d345521ac6566588.tar.bz2
openbsd-c033d8dd5f1b51daaea294f6d345521ac6566588.zip
Automatically complete the handshake from tls13_legacy_{read,write}_bytes()
If the TLS handshake has not been completed, automatically complete the handshake as part of the read/write call, implementing the current SSL_read()/SSL_write() behaviour. Once the TLS handshake is completed we push a WANT_POLLIN or WANT_POLLOUT back up to the caller, since some applications appear to incorrectly call SSL_read() or SSL_write(), rather than repeating the previous call. This can lead to attempts to read data that does not exist, since the WANT_POLLIN was actually triggered as part of the handshake. ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/tls13_handshake.c')
-rw-r--r--src/lib/libssl/tls13_handshake.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/tls13_handshake.c b/src/lib/libssl/tls13_handshake.c
index d4fc7cb6f7..536630ac33 100644
--- a/src/lib/libssl/tls13_handshake.c
+++ b/src/lib/libssl/tls13_handshake.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_handshake.c,v 1.30 2019/02/28 17:39:36 jsing Exp $ */ 1/* $OpenBSD: tls13_handshake.c,v 1.31 2019/02/28 17:56:43 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org> 3 * Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org>
4 * Copyright (c) 2019 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2019 Joel Sing <jsing@openbsd.org>
@@ -282,6 +282,7 @@ tls13_handshake_perform(struct tls13_ctx *ctx)
282 return TLS13_IO_FAILURE; 282 return TLS13_IO_FAILURE;
283 283
284 if (action->handshake_complete) { 284 if (action->handshake_complete) {
285 ctx->handshake_completed = 1;
285 tls13_record_layer_handshake_completed(ctx->rl); 286 tls13_record_layer_handshake_completed(ctx->rl);
286 return TLS13_IO_SUCCESS; 287 return TLS13_IO_SUCCESS;
287 } 288 }