diff options
| author |   jsing <jsing@openbsd.org> | 2019-01-21 10:24:25 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2019-01-21 10:24:25 +0000 |
| commit | d38686d6eee945664fdbd22c8f55f67944e9350d (patch) | |
| tree | 964e9604e79401b2b91bc046c1428f4c5c41d3d0 /lib/libssl/tls13_lib.c | |
| parent | use KEM API for vanilla c25519 KEX (diff) | |
| download | wireguard-openbsd-d38686d6eee945664fdbd22c8f55f67944e9350d.tar.xz wireguard-openbsd-d38686d6eee945664fdbd22c8f55f67944e9350d.zip | |
Correct some rwstate handling that I broke when refactoring.
Diffstat (limited to 'lib/libssl/tls13_lib.c')
| -rw-r--r-- | lib/libssl/tls13_lib.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lib/libssl/tls13_lib.c b/lib/libssl/tls13_lib.c index a9d83d709a4..c4cce26ca53 100644 --- a/lib/libssl/tls13_lib.c +++ b/lib/libssl/tls13_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_lib.c,v 1.1 2019/01/21 09:10:58 jsing Exp $ */ +/* $OpenBSD: tls13_lib.c,v 1.2 2019/01/21 10:24:25 jsing Exp $ */ /* * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> * @@ -71,6 +71,8 @@ tls13_legacy_wire_read(SSL *ssl, uint8_t *buf, size_t len) return TLS13_IO_FAILURE; } + ssl->internal->rwstate = SSL_READING; + if ((n = BIO_read(ssl->rbio, buf, len)) <= 0) { if (BIO_should_read(ssl->rbio)) return TLS13_IO_WANT_POLLIN; @@ -80,6 +82,9 @@ tls13_legacy_wire_read(SSL *ssl, uint8_t *buf, size_t len) return TLS13_IO_FAILURE; } + if (n == len) + ssl->internal->rwstate = SSL_NOTHING; + return n; } @@ -101,6 +106,8 @@ tls13_legacy_wire_write(SSL *ssl, const uint8_t *buf, size_t len) return TLS13_IO_FAILURE; } + ssl->internal->rwstate = SSL_WRITING; + if ((n = BIO_write(ssl->wbio, buf, len)) <= 0) { if (BIO_should_read(ssl->wbio)) return TLS13_IO_WANT_POLLIN; @@ -110,6 +117,9 @@ tls13_legacy_wire_write(SSL *ssl, const uint8_t *buf, size_t len) return TLS13_IO_FAILURE; } + if (n == len) + ssl->internal->rwstate = SSL_NOTHING; + return n; } @@ -124,8 +134,6 @@ tls13_legacy_wire_write_cb(const void *buf, size_t n, void *arg) static int tls13_legacy_return_code(SSL *ssl, ssize_t ret) { - ssl->internal->rwstate = SSL_NOTHING; - if (ret > INT_MAX) { SSLerror(ssl, ERR_R_INTERNAL_ERROR); return -1; @@ -135,6 +143,8 @@ tls13_legacy_return_code(SSL *ssl, ssize_t ret) if (ret > 0) return ret; + ssl->internal->rwstate = SSL_NOTHING; + switch (ret) { case TLS13_IO_EOF: return 0; |