diff options
author | jsing <> | 2020-09-11 15:28:08 +0000 |
---|---|---|
committer | jsing <> | 2020-09-11 15:28:08 +0000 |
commit | aaafcc65a8b1deda1feab495b687eeec194f78bb (patch) | |
tree | 7142d16dc8b078e547e2f879cb02e4df5a30eb75 /src/lib/libssl/ssl_locl.h | |
parent | 54fa1d3a6727088bd1475d3822d8070cb9e734a9 (diff) | |
download | openbsd-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_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index bd210cdce5..bfd0ea6733 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.288 2020/09/01 12:40:53 tb Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.289 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 | * |
@@ -1127,8 +1127,8 @@ int ssl_version_set_min(const SSL_METHOD *meth, uint16_t ver, uint16_t max_ver, | |||
1127 | int ssl_version_set_max(const SSL_METHOD *meth, uint16_t ver, uint16_t min_ver, | 1127 | int ssl_version_set_max(const SSL_METHOD *meth, uint16_t ver, uint16_t min_ver, |
1128 | uint16_t *out_ver); | 1128 | uint16_t *out_ver); |
1129 | int ssl_downgrade_max_version(SSL *s, uint16_t *max_ver); | 1129 | int ssl_downgrade_max_version(SSL *s, uint16_t *max_ver); |
1130 | int ssl_cipher_is_permitted(const SSL_CIPHER *cipher, uint16_t min_ver, | 1130 | int ssl_cipher_allowed_in_version_range(const SSL_CIPHER *cipher, |
1131 | uint16_t max_ver); | 1131 | uint16_t min_ver, uint16_t max_ver); |
1132 | 1132 | ||
1133 | const SSL_METHOD *tls_legacy_method(void); | 1133 | const SSL_METHOD *tls_legacy_method(void); |
1134 | const SSL_METHOD *tls_legacy_client_method(void); | 1134 | const SSL_METHOD *tls_legacy_client_method(void); |