summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r--src/lib/libssl/t1_lib.c6
1 files changed, 1 insertions, 5 deletions
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 @@
1/* $OpenBSD: t1_lib.c,v 1.166 2020/05/10 14:17:48 jsing Exp $ */ 1/* $OpenBSD: t1_lib.c,v 1.167 2020/05/29 17:39:42 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -629,7 +629,6 @@ ssl_check_clienthello_tlsext_early(SSL *s)
629 ssl3_send_alert(s, SSL3_AL_WARNING, al); 629 ssl3_send_alert(s, SSL3_AL_WARNING, al);
630 return 1; 630 return 1;
631 case SSL_TLSEXT_ERR_NOACK: 631 case SSL_TLSEXT_ERR_NOACK:
632 s->internal->servername_done = 0;
633 default: 632 default:
634 return 1; 633 return 1;
635 } 634 }
@@ -737,14 +736,11 @@ ssl_check_serverhello_tlsext(SSL *s)
737 switch (ret) { 736 switch (ret) {
738 case SSL_TLSEXT_ERR_ALERT_FATAL: 737 case SSL_TLSEXT_ERR_ALERT_FATAL:
739 ssl3_send_alert(s, SSL3_AL_FATAL, al); 738 ssl3_send_alert(s, SSL3_AL_FATAL, al);
740
741 return -1; 739 return -1;
742 case SSL_TLSEXT_ERR_ALERT_WARNING: 740 case SSL_TLSEXT_ERR_ALERT_WARNING:
743 ssl3_send_alert(s, SSL3_AL_WARNING, al); 741 ssl3_send_alert(s, SSL3_AL_WARNING, al);
744
745 return 1; 742 return 1;
746 case SSL_TLSEXT_ERR_NOACK: 743 case SSL_TLSEXT_ERR_NOACK:
747 s->internal->servername_done = 0;
748 default: 744 default:
749 return 1; 745 return 1;
750 } 746 }