From 5251ab8ebfaae4c128eb38be605d2bdecef0131f Mon Sep 17 00:00:00 2001 From: jsing Date: Tue, 31 Mar 2015 12:21:27 +0000 Subject: Store errors that occur during a tls_accept_socket() call on the context for the server, rather than on the context for the connection. This makes more sense than the current behaviour does. Issue reported by Tim van der Molen. --- lib/libtls/tls.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/libtls/tls.c') diff --git a/lib/libtls/tls.c b/lib/libtls/tls.c index 9fc81b5a646..b7b6570ff96 100644 --- a/lib/libtls/tls.c +++ b/lib/libtls/tls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls.c,v 1.7 2015/02/07 09:50:09 jsing Exp $ */ +/* $OpenBSD: tls.c,v 1.8 2015/03/31 12:21:27 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing * @@ -237,13 +237,13 @@ tls_reset(struct tls *ctx) } int -tls_ssl_error(struct tls *ctx, int ssl_ret, const char *prefix) +tls_ssl_error(struct tls *ctx, SSL *ssl_conn, int ssl_ret, const char *prefix) { const char *errstr = "unknown error"; unsigned long err; int ssl_err; - ssl_err = SSL_get_error(ctx->ssl_conn, ssl_ret); + ssl_err = SSL_get_error(ssl_conn, ssl_ret); switch (ssl_err) { case SSL_ERROR_NONE: return (0); @@ -301,7 +301,7 @@ tls_read(struct tls *ctx, void *buf, size_t buflen, size_t *outlen) return (0); } - return tls_ssl_error(ctx, ssl_ret, "read"); + return tls_ssl_error(ctx, ctx->ssl_conn, ssl_ret, "read"); } int @@ -320,7 +320,7 @@ tls_write(struct tls *ctx, const void *buf, size_t buflen, size_t *outlen) return (0); } - return tls_ssl_error(ctx, ssl_ret, "write"); + return tls_ssl_error(ctx, ctx->ssl_conn, ssl_ret, "write"); } int -- cgit v1.2.3-59-g8ed1b