summaryrefslogtreecommitdiffstats
path: root/lib/libssl
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2019-05-29 17:25:27 +0000
committerjsing <jsing@openbsd.org>2019-05-29 17:25:27 +0000
commit63450c714f31c2aac250a9d9d0b4d9ed438de697 (patch)
treea80d0601dcfd70f4d3146686d3ed3c2bd3f0c78a /lib/libssl
parentThe past is fuzzy, but it appears during development of __getcwd, *retval (diff)
downloadwireguard-openbsd-63450c714f31c2aac250a9d9d0b4d9ed438de697.tar.xz
wireguard-openbsd-63450c714f31c2aac250a9d9d0b4d9ed438de697.zip
Do not send an SNI extension when resuming a session that contains a server
name (which means the client sent SNI during the initial handshake). Issue reported by Renaud Allard. ok tb@
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/ssl_tlsext.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/libssl/ssl_tlsext.c b/lib/libssl/ssl_tlsext.c
index b532d49a63e..506cfbcfeac 100644
--- a/lib/libssl/ssl_tlsext.c
+++ b/lib/libssl/ssl_tlsext.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_tlsext.c,v 1.47 2019/05/28 17:34:32 jsing Exp $ */
+/* $OpenBSD: ssl_tlsext.c,v 1.48 2019/05/29 17:25:27 jsing Exp $ */
/*
* Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org>
* Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
@@ -677,6 +677,9 @@ tlsext_sni_server_parse(SSL *s, CBS *cbs, int *alert)
int
tlsext_sni_server_needs(SSL *s)
{
+ if (s->internal->hit)
+ return 0;
+
return (s->session->tlsext_hostname != NULL);
}