summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2019-02-28 17:51:19 +0000
committerjsing <>2019-02-28 17:51:19 +0000
commitfff434b2b23e8a074d741e819b9a91ddac0d4c9c (patch)
tree9ef05911914b334d6d3b35923431a4eb89a962e7 /src/lib
parent2a44fea2cb55e6123807858ba43414b276b2d2fe (diff)
downloadopenbsd-fff434b2b23e8a074d741e819b9a91ddac0d4c9c.tar.gz
openbsd-fff434b2b23e8a074d741e819b9a91ddac0d4c9c.tar.bz2
openbsd-fff434b2b23e8a074d741e819b9a91ddac0d4c9c.zip
Set the SSL state as part of tls13_legacy_connect().
Set the SSL state to SSL_ST_CONNECT during the TLSv1.3 handshake and to SSL_ST_OK once the handshake completes, since some applications currently rely on this information to function correctly. ok inoguchi@ tb@
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/tls13_client.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c
index 728d1a00c8..56faf3f5d4 100644
--- a/src/lib/libssl/tls13_client.c
+++ b/src/lib/libssl/tls13_client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_client.c,v 1.12 2019/02/25 16:46:17 jsing Exp $ */ 1/* $OpenBSD: tls13_client.c,v 1.13 2019/02/28 17:51:19 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -79,7 +79,10 @@ tls13_legacy_connect(SSL *ssl)
79 } 79 }
80 } 80 }
81 81
82 ret = tls13_connect(ctx); 82 S3I(ssl)->hs.state = SSL_ST_CONNECT;
83
84 if ((ret = tls13_connect(ctx)) == TLS13_IO_SUCCESS)
85 S3I(ssl)->hs.state = SSL_ST_OK;
83 86
84 return tls13_legacy_return_code(ssl, ret); 87 return tls13_legacy_return_code(ssl, ret);
85} 88}