summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libtls/tls.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libtls/tls.c b/lib/libtls/tls.c
index 246e025e7a7..4536bae1837 100644
--- a/lib/libtls/tls.c
+++ b/lib/libtls/tls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls.c,v 1.12 2015/07/18 22:15:09 bluhm Exp $ */
+/* $OpenBSD: tls.c,v 1.13 2015/08/22 14:20:53 jsing Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@@ -290,6 +290,8 @@ tls_read(struct tls *ctx, void *buf, size_t buflen, size_t *outlen)
{
int ssl_ret;
+ *outlen = 0;
+
if (buflen > INT_MAX) {
tls_set_error(ctx, "buflen too long");
return (-1);
@@ -301,8 +303,6 @@ tls_read(struct tls *ctx, void *buf, size_t buflen, size_t *outlen)
return (0);
}
- *outlen = 0;
-
return tls_ssl_error(ctx, ctx->ssl_conn, ssl_ret, "read");
}
@@ -311,6 +311,8 @@ tls_write(struct tls *ctx, const void *buf, size_t buflen, size_t *outlen)
{
int ssl_ret;
+ *outlen = 0;
+
if (buflen > INT_MAX) {
tls_set_error(ctx, "buflen too long");
return (-1);
@@ -322,8 +324,6 @@ tls_write(struct tls *ctx, const void *buf, size_t buflen, size_t *outlen)
return (0);
}
- *outlen = 0;
-
return tls_ssl_error(ctx, ctx->ssl_conn, ssl_ret, "write");
}