summaryrefslogtreecommitdiffstats
path: root/lib/libtls/tls_client.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2017-01-12 16:15:58 +0000
committerjsing <jsing@openbsd.org>2017-01-12 16:15:58 +0000
commit59bda8bee57cb04cf404e9df2be07e33441a66f4 (patch)
tree92934d53262baf46a86fc01d57a8d81c7298964e /lib/libtls/tls_client.c
parentRemove unneeded splsoftnet(). (diff)
downloadwireguard-openbsd-59bda8bee57cb04cf404e9df2be07e33441a66f4.tar.xz
wireguard-openbsd-59bda8bee57cb04cf404e9df2be07e33441a66f4.zip
If tls_set_cbs() fails an error will already be specified, so do not
replace it with a less specific one.
Diffstat (limited to 'lib/libtls/tls_client.c')
-rw-r--r--lib/libtls/tls_client.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libtls/tls_client.c b/lib/libtls/tls_client.c
index 18e1667eed9..d22a8a95ce3 100644
--- a/lib/libtls/tls_client.c
+++ b/lib/libtls/tls_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_client.c,v 1.38 2016/12/26 16:20:58 jsing Exp $ */
+/* $OpenBSD: tls_client.c,v 1.39 2017/01/12 16:15:58 jsing Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
*
@@ -276,10 +276,8 @@ tls_connect_cbs(struct tls *ctx, tls_read_cb read_cb,
if (tls_connect_common(ctx, servername) != 0)
goto err;
- if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) {
- tls_set_errorx(ctx, "callback registration failure");
+ if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0)
goto err;
- }
rv = 0;