Mop up servername_done, which is unused.

ok beck@ inoguchi@ tb@

3 files changed, 3 insertions, 14 deletions

diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 736005b5c9..046c4bba52 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.275 2020/05/19 16:35:20 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.276 2020/05/29 17:39:42 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -738,12 +738,6 @@ typedef struct ssl_internal_st {
         long max_cert_list;
         int first_packet;
 
-        int servername_done;    /* no further mod of servername
-                                   0 : call the servername extension callback.
-                                   1 : prepare 2, allow last ack just after in server callback.
-                                   2 : don't call servername callback, no ack in server hello
-                                   */
-
         /* Expect OCSP CertificateStatus message */
         int tlsext_status_expected;
         /* OCSP status request only */
diff --git a/src/lib/libssl/ssl_tlsext.c b/src/lib/libssl/ssl_tlsext.c
index e6e0e7a92d..cf54fc4d2c 100644
--- a/src/lib/libssl/ssl_tlsext.c
+++ b/src/lib/libssl/ssl_tlsext.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_tlsext.c,v 1.73 2020/05/24 15:13:22 tb Exp $ */
+/* $OpenBSD: ssl_tlsext.c,v 1.74 2020/05/29 17:39:42 jsing Exp $ */
 /*
  * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
@@ -2133,7 +2133,6 @@ tlsext_parse(SSL *s, CBS *cbs, int *alert, int is_server, uint16_t msg_type)
 static void
 tlsext_server_reset_state(SSL *s)
 {
-        s->internal->servername_done = 0;
         s->tlsext_status_type = -1;
         S3I(s)->renegotiate_seen = 0;
         free(S3I(s)->alpn_selected);
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index fc828541cd..580ae4b19b 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.166 2020/05/10 14:17:48 jsing Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.167 2020/05/29 17:39:42 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -629,7 +629,6 @@ ssl_check_clienthello_tlsext_early(SSL *s)
                 ssl3_send_alert(s, SSL3_AL_WARNING, al);
                 return 1;
         case SSL_TLSEXT_ERR_NOACK:
-                s->internal->servername_done = 0;
         default:
                 return 1;
         }
@@ -737,14 +736,11 @@ ssl_check_serverhello_tlsext(SSL *s)
         switch (ret) {
         case SSL_TLSEXT_ERR_ALERT_FATAL:
                 ssl3_send_alert(s, SSL3_AL_FATAL, al);
-
                 return -1;
         case SSL_TLSEXT_ERR_ALERT_WARNING:
                 ssl3_send_alert(s, SSL3_AL_WARNING, al);
-
                 return 1;
         case SSL_TLSEXT_ERR_NOACK:
-                s->internal->servername_done = 0;
         default:
                 return 1;
         }