Don't acknowledge a servername following warning alert in servername cb
authorMatt Caswell <matt@openssl.org>
Mon, 2 Dec 2019 17:29:21 +0000 (17:29 +0000)
committerMatt Caswell <matt@openssl.org>
Thu, 30 Jan 2020 16:01:26 +0000 (16:01 +0000)
If the servername cb decides to send back a warning alert then the
handshake continues, but we should not signal to the client that the
servername has been accepted.

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/10018)

ssl/statem/extensions.c

index d37acca..d4c6c92 100644 (file)
@@ -1009,6 +1009,7 @@ static int final_server_name(SSL *s, unsigned int context, int sent)
         /* TLSv1.3 doesn't have warning alerts so we suppress this */
         if (!SSL_IS_TLS13(s))
             ssl3_send_alert(s, SSL3_AL_WARNING, altmp);
+        s->servername_done = 0;
         return 1;
 
     case SSL_TLSEXT_ERR_NOACK: