From eefb2f934eae206bc2a63b355ab70e79aaa9c92c Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Wed, 14 Sep 2016 11:34:37 +0000
Subject: Set callbacks on the right tls ctx on accept.

From Tobias Pape
---
 src/lib/libtls/tls_server.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libtls/tls_server.c b/src/lib/libtls/tls_server.c
index fd352a8a94..fbd726f335 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.27 2016/09/04 13:20:56 jsing Exp $ */
+/* $OpenBSD: tls_server.c,v 1.28 2016/09/14 11:34:37 bcook Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -351,7 +351,7 @@ tls_accept_cbs(struct tls *ctx, struct tls **cctx,
 	if ((conn_ctx = tls_accept_common(ctx)) == NULL)
 		goto err;
 
-	if (tls_set_cbs(ctx, read_cb, write_cb, cb_arg) != 0) {
+	if (tls_set_cbs(conn_ctx, read_cb, write_cb, cb_arg) != 0) {
 		tls_set_errorx(ctx, "callback registration failure");
 		goto err;
 	}
-- 
cgit v1.2.3-55-g6feb