From 939caa9f5a94e32a8cd5c477ca014545d378cf18 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 7 May 2017 03:27:06 +0000
Subject: Ensure that a client context has been connected before attempting to
 complete a TLS handshake.

---
 src/lib/libtls/tls_client.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/lib/libtls/tls_client.c')

diff --git a/src/lib/libtls/tls_client.c b/src/lib/libtls/tls_client.c
index 0e519684ef..b92490f25d 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.41 2017/04/10 17:11:13 jsing Exp $ */
+/* $OpenBSD: tls_client.c,v 1.42 2017/05/07 03:27:06 jsing Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -230,6 +230,8 @@ tls_connect_common(struct tls *ctx, const char *servername)
 			goto err;
 		}
 	}
+
+	ctx->state |= TLS_CONNECTED;
 	rv = 0;
 
  err:
@@ -297,6 +299,11 @@ tls_handshake_client(struct tls *ctx)
 		goto err;
 	}
 
+	if ((ctx->state & TLS_CONNECTED) == 0) {
+		tls_set_errorx(ctx, "context not connected");
+		goto err;
+	}
+
 	ctx->state |= TLS_SSL_NEEDS_SHUTDOWN;
 
 	ERR_clear_error();
-- 
cgit v1.2.3-55-g6feb