summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorbluhm <bluhm@openbsd.org>2015-01-30 14:25:37 +0000
committerbluhm <bluhm@openbsd.org>2015-01-30 14:25:37 +0000
commitf30b95a1589543bc23a1a0f919ae305bd485cd12 (patch)
tree1522f113eb3fe6b4d68486bfa5a5d9a851ba9e5b /lib
parentTweak error message to say 'realloc' since that's what's failing, (diff)
downloadwireguard-openbsd-f30b95a1589543bc23a1a0f919ae305bd485cd12.tar.xz
wireguard-openbsd-f30b95a1589543bc23a1a0f919ae305bd485cd12.zip
Make the TLS connect and accept error messages consistent.
OK jsing@
Diffstat (limited to 'lib')
-rw-r--r--lib/libtls/tls_client.c4
-rw-r--r--lib/libtls/tls_server.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/libtls/tls_client.c b/lib/libtls/tls_client.c
index 4a9a4c976d8..d9354c3140d 100644
--- a/lib/libtls/tls_client.c
+++ b/lib/libtls/tls_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_client.c,v 1.9 2015/01/22 09:16:24 reyk Exp $ */
+/* $OpenBSD: tls_client.c,v 1.10 2015/01/30 14:25:37 bluhm Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@@ -225,7 +225,7 @@ tls_connect_fds(struct tls *ctx, int fd_read, int fd_write,
ctx->flags |= TLS_CONNECTING;
return (TLS_WRITE_AGAIN);
default:
- tls_set_error(ctx, "SSL connect failed: %i", ssl_err);
+ tls_set_error(ctx, "TLS connect failed (%i)", ssl_err);
goto err;
}
}
diff --git a/lib/libtls/tls_server.c b/lib/libtls/tls_server.c
index 514148bd936..ac44f260ac2 100644
--- a/lib/libtls/tls_server.c
+++ b/lib/libtls/tls_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_server.c,v 1.2 2015/01/16 14:34:51 reyk Exp $ */
+/* $OpenBSD: tls_server.c,v 1.3 2015/01/30 14:25:37 bluhm Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@@ -133,8 +133,7 @@ tls_accept_socket(struct tls *ctx, struct tls **cctx, int socket)
case SSL_ERROR_WANT_WRITE:
return (TLS_WRITE_AGAIN);
default:
- tls_set_error(ctx, "ssl accept failure (%i)",
- ssl_err);
+ tls_set_error(ctx, "TLS accept failed (%i)", ssl_err);
goto err;
}
}