summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
authorjsing <>2020-09-11 15:28:08 +0000
committerjsing <>2020-09-11 15:28:08 +0000
commitaaafcc65a8b1deda1feab495b687eeec194f78bb (patch)
tree7142d16dc8b078e547e2f879cb02e4df5a30eb75 /src/lib/libssl/ssl_lib.c
parent54fa1d3a6727088bd1475d3822d8070cb9e734a9 (diff)
downloadopenbsd-aaafcc65a8b1deda1feab495b687eeec194f78bb.tar.gz
openbsd-aaafcc65a8b1deda1feab495b687eeec194f78bb.tar.bz2
openbsd-aaafcc65a8b1deda1feab495b687eeec194f78bb.zip
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@
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r--src/lib/libssl/ssl_lib.c5
1 files changed, 3 insertions, 2 deletions
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 @@
1/* $OpenBSD: ssl_lib.c,v 1.222 2020/09/11 13:20:32 jsing Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.223 2020/09/11 15:28:08 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1298,7 +1298,8 @@ SSL_get1_supported_ciphers(SSL *s)
1298 for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) { 1298 for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) {
1299 if ((cipher = sk_SSL_CIPHER_value(ciphers, i)) == NULL) 1299 if ((cipher = sk_SSL_CIPHER_value(ciphers, i)) == NULL)
1300 goto err; 1300 goto err;
1301 if (!ssl_cipher_is_permitted(cipher, min_vers, max_vers)) 1301 if (!ssl_cipher_allowed_in_version_range(cipher, min_vers,
1302 max_vers))
1302 continue; 1303 continue;
1303 if (!sk_SSL_CIPHER_push(supported_ciphers, cipher)) 1304 if (!sk_SSL_CIPHER_push(supported_ciphers, cipher))
1304 goto err; 1305 goto err;