diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2019-01-20 02:53:57 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2019-01-20 02:53:57 +0000 |
| commit | 1e94cdf52efe6bf96e0ee3a430a60234e626a917 (patch) | |
| tree | d6ff290d106197848333f1a2e6c31836076cdecb /lib | |
| parent | 8ac55d1f80ad6e8ef01f5dd90e15439f17e3a8c9 (diff) | |
TLS 1.3 clients always need to send the supported groups extension.
A couple of cleanup/style tweaks while here.
ok tb@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/ssl_tlsext.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/libssl/ssl_tlsext.c b/lib/libssl/ssl_tlsext.c index f4f0ba321c4..6eec807f56a 100644 --- a/lib/libssl/ssl_tlsext.c +++ b/lib/libssl/ssl_tlsext.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_tlsext.c,v 1.30 2019/01/18 12:16:15 beck Exp $ */ +/* $OpenBSD: ssl_tlsext.c,v 1.31 2019/01/20 02:53:56 jsing Exp $ */ /* * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> @@ -170,7 +170,8 @@ tlsext_alpn_client_parse(SSL *s, CBS *cbs, int *alert) int tlsext_supportedgroups_client_needs(SSL *s) { - return ssl_has_ecc_ciphers(s); + return ssl_has_ecc_ciphers(s) || + (S3I(s)->hs_tls13.max_version >= TLS1_3_VERSION); } int @@ -1293,7 +1294,7 @@ tlsext_keyshare_client_parse(SSL *s, CBS *cbs, int *alert) if (CBS_len(&key_exchange) != X25519_KEY_LENGTH) goto err; if (!CBS_stow(&key_exchange, &S3I(s)->hs_tls13.x25519_peer_public, - &out_len)) + &out_len)) goto err; return 1; @@ -1319,9 +1320,9 @@ tlsext_versions_client_needs(SSL *s) int tlsext_versions_client_build(SSL *s, CBB *cbb) { + uint16_t max, min; uint16_t version; CBB versions; - uint16_t max, min; max = S3I(s)->hs_tls13.max_version; min = S3I(s)->hs_tls13.min_version; |