diff options
| author |   jsing <jsing@openbsd.org> | 2016-12-24 13:52:42 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2016-12-24 13:52:42 +0000 |
| commit | 297085e2c98f1262e9961fa294a2d6ac6cc8b08d (patch) | |
| tree | a782c7907a1515043cac98682c215fb40ed5bdca | |
| parent | Grab the NET_LOCK() before calling ipsp_process_done() as it ends up (diff) | |
| download | wireguard-openbsd-297085e2c98f1262e9961fa294a2d6ac6cc8b08d.tar.xz wireguard-openbsd-297085e2c98f1262e9961fa294a2d6ac6cc8b08d.zip | |
Correctly handle tls_read()/tls_write().
In one tls_read() case, we failed to check for WANT_{POLLIN,POLLOUT}, so
fix that. In the same tls_read() case and the tls_write() case we fail to
handle errors correctly, which means that error is not reported and can be
lost by a futher libtls call.
ok beck@ jca@
| -rw-r--r-- | usr.bin/ftp/fetch.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c index e889575279e..92ce71ad04b 100644 --- a/usr.bin/ftp/fetch.c +++ b/usr.bin/ftp/fetch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fetch.c,v 1.152 2016/12/16 17:44:59 krw Exp $ */ +/* $OpenBSD: fetch.c,v 1.153 2016/12/24 13:52:42 jsing Exp $ */ /* $NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $ */ /*- @@ -1466,8 +1466,13 @@ ftp_read(FILE *fp, struct tls *tls, char *buf, size_t len) ret = fread(buf, sizeof(char), len, fp); #ifndef SMALL else if (tls != NULL) { + again: if ((tls_ret = tls_read(tls, buf, len)) >= 0) ret = (size_t)tls_ret; + if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) + goto again; + if (ret < 0) + errx(1, "SSL read error: %s", tls_error(tls)); } #endif /* !SMALL */ return (ret); @@ -1518,7 +1523,7 @@ SSL_vprintf(struct tls *tls, const char *fmt, va_list ap) if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) continue; if (ret < 0) - break; + errx(1, "SSL write error: %s", tls_error(tls)); buf += ret; len -= ret; } |