diff options
| author |   jsing <jsing@openbsd.org> | 2020-05-31 18:03:32 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2020-05-31 18:03:32 +0000 |
| commit | b9f2fbd8d2d0a5734e930c4fa8ec8d6b7f7b51c4 (patch) | |
| tree | 344da918e00b7bce4c6c8b4ad569cb2c8aec6ef9 /lib/libssl/ssl_ciphers.c | |
| parent | When building a chain look for non-expired certificates first. (diff) | |
| download | wireguard-openbsd-b9f2fbd8d2d0a5734e930c4fa8ec8d6b7f7b51c4.tar.xz wireguard-openbsd-b9f2fbd8d2d0a5734e930c4fa8ec8d6b7f7b51c4.zip | |
Replace ssl_max_server_version() with ssl_downgrade_max_version()
Replace the only occurrence of ssl_max_server_version() with a call
to ssl_downgrade_max_version() and remove ssl_max_server_version().
ok beck@ tb@
Diffstat (limited to 'lib/libssl/ssl_ciphers.c')
| -rw-r--r-- | lib/libssl/ssl_ciphers.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libssl/ssl_ciphers.c b/lib/libssl/ssl_ciphers.c index 3abed60b5b7..3a1fb14d5c9 100644 --- a/lib/libssl/ssl_ciphers.c +++ b/lib/libssl/ssl_ciphers.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_ciphers.c,v 1.3 2019/05/15 09:13:16 bcook Exp $ */ +/* $OpenBSD: ssl_ciphers.c,v 1.4 2020/05/31 18:03:32 jsing Exp $ */ /* * Copyright (c) 2015-2017 Doug Hogan <doug@openbsd.org> * Copyright (c) 2015-2018 Joel Sing <jsing@openbsd.org> @@ -133,8 +133,9 @@ ssl_bytes_to_cipher_list(SSL *s, CBS *cbs) * Fail if the current version is an unexpected * downgrade. */ - max_version = ssl_max_server_version(s); - if (max_version == 0 || s->version < max_version) { + if (!ssl_downgrade_max_version(s, &max_version)) + goto err; + if (s->version < max_version) { SSLerror(s, SSL_R_INAPPROPRIATE_FALLBACK); ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INAPPROPRIATE_FALLBACK); |