diff options
| author |   jsing <jsing@openbsd.org> | 2020-01-23 10:40:59 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-01-23 10:40:59 +0000 |
| commit | d86fea2310d44192f1ec4014ebe43807a1d8b39f (patch) | |
| tree | 603a3abecdef478ff05e495f38ea09e407e029a1 /lib/libssl/tls13_lib.c | |
| parent | Make zlib optional. This adds a "ZLIB" build time option that allows (diff) | |
| download | wireguard-openbsd-d86fea2310d44192f1ec4014ebe43807a1d8b39f.tar.xz wireguard-openbsd-d86fea2310d44192f1ec4014ebe43807a1d8b39f.zip | |
Correctly handle TLSv1.3 ciphers suites in ssl3_choose_cipher().
Currently, TLSv1.3 cipher suites are filtered out by the fact that
they have authentication and key exchange algorithms that are not
being set in ssl_set_cert_masks(). Fix this so that ssl3_choose_cipher()
works for TLSv1.3, however we also now need to ensure that we filter out
TLSv1.3 for non-TLSv1.3 and only select TLSv1.3 for TLSv1.3.
ok beck@ tb@
Diffstat (limited to 'lib/libssl/tls13_lib.c')
| -rw-r--r-- | lib/libssl/tls13_lib.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/libssl/tls13_lib.c b/lib/libssl/tls13_lib.c index 5d8c3590145..91dd566864f 100644 --- a/lib/libssl/tls13_lib.c +++ b/lib/libssl/tls13_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_lib.c,v 1.24 2020/01/23 07:30:55 beck Exp $ */ +/* $OpenBSD: tls13_lib.c,v 1.25 2020/01/23 10:40:59 jsing Exp $ */ /* * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> * Copyright (c) 2019 Bob Beck <beck@openbsd.org> @@ -24,6 +24,11 @@ #include "ssl_locl.h" #include "tls13_internal.h" +SSL3_ENC_METHOD TLSv1_3_enc_data = { + .enc = NULL, + .enc_flags = SSL_ENC_FLAG_TLS1_3_CIPHERS, +}; + /* * RFC 8446 section 4.1.3, magic values which must be set by the * server in server random if it is willing to downgrade but supports |