diff options
| author |   jsing <jsing@openbsd.org> | 2015-02-07 09:50:09 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-02-07 09:50:09 +0000 |
| commit | d474f84fda47888e6824e804d947dca1380b37e3 (patch) | |
| tree | 41b1a0d0a8f82638de6a5210249e949f8ad259c0 /lib/libtls/tls_client.c | |
| parent | pf synproxy will do the 3WHS on behalf of the target machine, and once (diff) | |
| download | wireguard-openbsd-d474f84fda47888e6824e804d947dca1380b37e3.tar.xz wireguard-openbsd-d474f84fda47888e6824e804d947dca1380b37e3.zip | |
Convert tls_connect_fds() and tls_accept_socket() to the new OpenSSL error
dance handling code. This means that we get slightly useful messages when
a TLS connection or accept fails.
Requested by reyk@
Diffstat (limited to 'lib/libtls/tls_client.c')
| -rw-r--r-- | lib/libtls/tls_client.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/libtls/tls_client.c b/lib/libtls/tls_client.c index d9354c3140d..85733cdd5e8 100644 --- a/lib/libtls/tls_client.c +++ b/lib/libtls/tls_client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_client.c,v 1.10 2015/01/30 14:25:37 bluhm Exp $ */ +/* $OpenBSD: tls_client.c,v 1.11 2015/02/07 09:50:09 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -136,7 +136,7 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write, { union { struct in_addr ip4; struct in6_addr ip6; } addrbuf; X509 *cert = NULL; - int ret, ssl_err; + int ret, err; if (ctx->flags & TLS_CONNECTING) goto connecting; @@ -216,18 +216,12 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write, connecting: if ((ret = SSL_connect(ctx->ssl_conn)) != 1) { - ssl_err = SSL_get_error(ctx->ssl_conn, ret); - switch (ssl_err) { - case SSL_ERROR_WANT_READ: + err = tls_ssl_error(ctx, ret, "connect"); + if (err == TLS_READ_AGAIN || err == TLS_WRITE_AGAIN) { ctx->flags |= TLS_CONNECTING; - return (TLS_READ_AGAIN); - case SSL_ERROR_WANT_WRITE: - ctx->flags |= TLS_CONNECTING; - return (TLS_WRITE_AGAIN); - default: - tls_set_error(ctx, "TLS connect failed (%i)", ssl_err); - goto err; + return (err); } + goto err; } ctx->flags &= ~TLS_CONNECTING; |