diff options
author | jsing <> | 2019-02-28 17:56:43 +0000 |
---|---|---|
committer | jsing <> | 2019-02-28 17:56:43 +0000 |
commit | c033d8dd5f1b51daaea294f6d345521ac6566588 (patch) | |
tree | 5afffe228b3a0a9a1724ae29407d33698377ad48 /src/lib/libssl/tls13_internal.h | |
parent | fff434b2b23e8a074d741e819b9a91ddac0d4c9c (diff) | |
download | openbsd-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_internal.h')
-rw-r--r-- | src/lib/libssl/tls13_internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/tls13_internal.h b/src/lib/libssl/tls13_internal.h index c3b698e987..f3cccc14a6 100644 --- a/src/lib/libssl/tls13_internal.h +++ b/src/lib/libssl/tls13_internal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_internal.h,v 1.24 2019/02/25 19:44:04 tb Exp $ */ | 1 | /* $OpenBSD: tls13_internal.h,v 1.25 2019/02/28 17:56:43 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> |
4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2018 Theo Buehler <tb@openbsd.org> |
@@ -156,6 +156,7 @@ struct tls13_ctx { | |||
156 | struct ssl_handshake_tls13_st *hs; | 156 | struct ssl_handshake_tls13_st *hs; |
157 | uint8_t mode; | 157 | uint8_t mode; |
158 | struct tls13_handshake_stage handshake_stage; | 158 | struct tls13_handshake_stage handshake_stage; |
159 | int handshake_completed; | ||
159 | 160 | ||
160 | const EVP_AEAD *aead; | 161 | const EVP_AEAD *aead; |
161 | const EVP_MD *hash; | 162 | const EVP_MD *hash; |