diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libtls/tls.c | 8 | ||||
| -rw-r--r-- | src/lib/libtls/tls.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libtls/tls.c b/src/lib/libtls/tls.c index c89b805af9..448b048b33 100644 --- a/src/lib/libtls/tls.c +++ b/src/lib/libtls/tls.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls.c,v 1.21 2015/09/10 10:22:28 beck Exp $ */ | 1 | /* $OpenBSD: tls.c,v 1.22 2015/09/10 10:26:49 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -337,10 +337,10 @@ tls_ssl_error(struct tls *ctx, SSL *ssl_conn, int ssl_ret, const char *prefix) | |||
| 337 | return (0); | 337 | return (0); |
| 338 | 338 | ||
| 339 | case SSL_ERROR_WANT_READ: | 339 | case SSL_ERROR_WANT_READ: |
| 340 | return (TLS_READ_AGAIN); | 340 | return (TLS_WANT_POLLIN); |
| 341 | 341 | ||
| 342 | case SSL_ERROR_WANT_WRITE: | 342 | case SSL_ERROR_WANT_WRITE: |
| 343 | return (TLS_WRITE_AGAIN); | 343 | return (TLS_WANT_POLLOUT); |
| 344 | 344 | ||
| 345 | case SSL_ERROR_SYSCALL: | 345 | case SSL_ERROR_SYSCALL: |
| 346 | if ((err = ERR_peek_error()) != 0) { | 346 | if ((err = ERR_peek_error()) != 0) { |
| @@ -448,7 +448,7 @@ tls_close(struct tls *ctx) | |||
| 448 | if (ssl_ret < 0) { | 448 | if (ssl_ret < 0) { |
| 449 | rv = tls_ssl_error(ctx, ctx->ssl_conn, ssl_ret, | 449 | rv = tls_ssl_error(ctx, ctx->ssl_conn, ssl_ret, |
| 450 | "shutdown"); | 450 | "shutdown"); |
| 451 | if (rv == TLS_READ_AGAIN || rv == TLS_WRITE_AGAIN) | 451 | if (rv == TLS_WANT_POLLIN || rv == TLS_WANT_POLLOUT) |
| 452 | goto out; | 452 | goto out; |
| 453 | } | 453 | } |
| 454 | } | 454 | } |
diff --git a/src/lib/libtls/tls.h b/src/lib/libtls/tls.h index 13b88c31d4..f7c12920e0 100644 --- a/src/lib/libtls/tls.h +++ b/src/lib/libtls/tls.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls.h,v 1.17 2015/09/10 10:22:28 beck Exp $ */ | 1 | /* $OpenBSD: tls.h,v 1.18 2015/09/10 10:26:49 beck Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -36,8 +36,8 @@ extern "C" { | |||
| 36 | #define TLS_PROTOCOLS_ALL TLS_PROTOCOL_TLSv1 | 36 | #define TLS_PROTOCOLS_ALL TLS_PROTOCOL_TLSv1 |
| 37 | #define TLS_PROTOCOLS_DEFAULT TLS_PROTOCOL_TLSv1_2 | 37 | #define TLS_PROTOCOLS_DEFAULT TLS_PROTOCOL_TLSv1_2 |
| 38 | 38 | ||
| 39 | #define TLS_READ_AGAIN -2 | 39 | #define TLS_WANT_POLLIN -2 |
| 40 | #define TLS_WRITE_AGAIN -3 | 40 | #define TLS_WANT_POLLOUT -3 |
| 41 | 41 | ||
| 42 | struct tls; | 42 | struct tls; |
| 43 | struct tls_config; | 43 | struct tls_config; |
