diff options
Diffstat (limited to 'src/lib/libtls/tls.c')
-rw-r--r-- | src/lib/libtls/tls.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c index 9fc81b5a64..b7b6570ff9 100644 --- a/src/lib/libtls/tls.c +++ b/src/lib/libtls/tls.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls.c,v 1.7 2015/02/07 09:50:09 jsing Exp $ */ | 1 | /* $OpenBSD: tls.c,v 1.8 2015/03/31 12:21:27 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -237,13 +237,13 @@ tls_reset(struct tls *ctx) | |||
237 | } | 237 | } |
238 | 238 | ||
239 | int | 239 | int |
240 | tls_ssl_error(struct tls *ctx, int ssl_ret, const char *prefix) | 240 | tls_ssl_error(struct tls *ctx, SSL *ssl_conn, int ssl_ret, const char *prefix) |
241 | { | 241 | { |
242 | const char *errstr = "unknown error"; | 242 | const char *errstr = "unknown error"; |
243 | unsigned long err; | 243 | unsigned long err; |
244 | int ssl_err; | 244 | int ssl_err; |
245 | 245 | ||
246 | ssl_err = SSL_get_error(ctx->ssl_conn, ssl_ret); | 246 | ssl_err = SSL_get_error(ssl_conn, ssl_ret); |
247 | switch (ssl_err) { | 247 | switch (ssl_err) { |
248 | case SSL_ERROR_NONE: | 248 | case SSL_ERROR_NONE: |
249 | return (0); | 249 | return (0); |
@@ -301,7 +301,7 @@ tls_read(struct tls *ctx, void *buf, size_t buflen, size_t *outlen) | |||
301 | return (0); | 301 | return (0); |
302 | } | 302 | } |
303 | 303 | ||
304 | return tls_ssl_error(ctx, ssl_ret, "read"); | 304 | return tls_ssl_error(ctx, ctx->ssl_conn, ssl_ret, "read"); |
305 | } | 305 | } |
306 | 306 | ||
307 | int | 307 | int |
@@ -320,7 +320,7 @@ tls_write(struct tls *ctx, const void *buf, size_t buflen, size_t *outlen) | |||
320 | return (0); | 320 | return (0); |
321 | } | 321 | } |
322 | 322 | ||
323 | return tls_ssl_error(ctx, ssl_ret, "write"); | 323 | return tls_ssl_error(ctx, ctx->ssl_conn, ssl_ret, "write"); |
324 | } | 324 | } |
325 | 325 | ||
326 | int | 326 | int |