If tls_set_cbs() fails an error will already be specified, so do not

replace it with a less specific one.

2 files changed, 4 insertions, 8 deletions

diff --git a/src/lib/libtls/tls_client.c b/src/lib/libtls/tls_client.c
index 18e1667eed..d22a8a95ce 100644
--- a/src/lib/libtls/tls_client.c
+++ b/src/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;
 
diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c
index a3883315e7..091dd7a153 100644
--- a/src/lib/libtls/tls_server.c
+++ b/src/lib/libtls/tls_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_server.c,v 1.31 2016/11/06 16:55:16 beck Exp $ */
+/* $OpenBSD: tls_server.c,v 1.32 2017/01/12 16:15:58 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -357,10 +357,8 @@ tls_accept_cbs(struct tls *ctx, struct tls **cctx,
         if ((conn_ctx = tls_accept_common(ctx)) == NULL)
                 goto err;
 
-        if (tls_set_cbs(conn_ctx, read_cb, write_cb, cb_arg) != 0) {
-                tls_set_errorx(ctx, "callback registration failure");
+        if (tls_set_cbs(conn_ctx, read_cb, write_cb, cb_arg) != 0)
                 goto err;
-        }
 
         *cctx = conn_ctx;