diff options
| author |   jsing <jsing@openbsd.org> | 2020-05-29 17:39:42 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-05-29 17:39:42 +0000 |
| commit | ddd788dfabd59e8e8d6989506b2f2519674a3fc0 (patch) | |
| tree | 08463c03f145dbdbc05765be83be39a044063038 | |
| parent | Add checks for SH downgrade sentinel and HRR hash in appstest.sh (diff) | |
| download | wireguard-openbsd-ddd788dfabd59e8e8d6989506b2f2519674a3fc0.tar.xz wireguard-openbsd-ddd788dfabd59e8e8d6989506b2f2519674a3fc0.zip | |
Mop up servername_done, which is unused.
ok beck@ inoguchi@ tb@
| -rw-r--r-- | lib/libssl/ssl_locl.h | 8 | ||||
| -rw-r--r-- | lib/libssl/ssl_tlsext.c | 3 | ||||
| -rw-r--r-- | lib/libssl/t1_lib.c | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index 736005b5c95..046c4bba528 100644 --- a/lib/libssl/ssl_locl.h +++ b/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/lib/libssl/ssl_tlsext.c b/lib/libssl/ssl_tlsext.c index e6e0e7a92d6..cf54fc4d2cb 100644 --- a/lib/libssl/ssl_tlsext.c +++ b/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/lib/libssl/t1_lib.c b/lib/libssl/t1_lib.c index fc828541cd4..580ae4b19b3 100644 --- a/lib/libssl/t1_lib.c +++ b/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; } |