From aaafcc65a8b1deda1feab495b687eeec194f78bb Mon Sep 17 00:00:00 2001 From: jsing <> Date: Fri, 11 Sep 2020 15:28:08 +0000 Subject: Rename ssl_cipher_is_permitted() The name ssl_cipher_is_permitted() is not entirely specific - what it really means is "can this cipher be used with a given version range". Use ssl_cipher_allowed_in_version_range() to more clearly indicate this. Bikeshedded with tb@ ok tb@ --- src/lib/libssl/ssl_lib.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/lib/libssl/ssl_lib.c') diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 6f8a14bca4..2879b198d5 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.222 2020/09/11 13:20:32 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.223 2020/09/11 15:28:08 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1298,7 +1298,8 @@ SSL_get1_supported_ciphers(SSL *s) for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) { if ((cipher = sk_SSL_CIPHER_value(ciphers, i)) == NULL) goto err; - if (!ssl_cipher_is_permitted(cipher, min_vers, max_vers)) + if (!ssl_cipher_allowed_in_version_range(cipher, min_vers, + max_vers)) continue; if (!sk_SSL_CIPHER_push(supported_ciphers, cipher)) goto err; -- cgit v1.2.3-55-g6feb