diff options
author | tb <> | 2019-01-21 10:28:52 +0000 |
---|---|---|
committer | tb <> | 2019-01-21 10:28:52 +0000 |
commit | ad9a15eedae120d64169a9bdeea62c66b99f0344 (patch) | |
tree | 23ba27fdd74b7e2b1a43f24cdf6a5eb8a32ec393 /src/lib/libssl/ssl_locl.h | |
parent | b43d2fde51a9d32e752d57173e0ef4b806d6bfbe (diff) | |
download | openbsd-ad9a15eedae120d64169a9bdeea62c66b99f0344.tar.gz openbsd-ad9a15eedae120d64169a9bdeea62c66b99f0344.tar.bz2 openbsd-ad9a15eedae120d64169a9bdeea62c66b99f0344.zip |
Add ssl_cipher_is_permitted(), an internal helper function that
will be used in a few places shortly, e.g. in
ssl_cipher_list_to_bytes().
ok jsing
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 30c1afd22d..7903d84890 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.227 2019/01/21 06:58:44 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.228 2019/01/21 10:28:52 tb 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 | * |
@@ -1052,6 +1052,8 @@ int ssl_version_set_min(const SSL_METHOD *meth, uint16_t ver, uint16_t max_ver, | |||
1052 | int ssl_version_set_max(const SSL_METHOD *meth, uint16_t ver, uint16_t min_ver, | 1052 | int ssl_version_set_max(const SSL_METHOD *meth, uint16_t ver, uint16_t min_ver, |
1053 | uint16_t *out_ver); | 1053 | uint16_t *out_ver); |
1054 | uint16_t ssl_max_server_version(SSL *s); | 1054 | uint16_t ssl_max_server_version(SSL *s); |
1055 | int ssl_cipher_is_permitted(const SSL_CIPHER *cipher, uint16_t min_ver, | ||
1056 | uint16_t max_ver); | ||
1055 | 1057 | ||
1056 | const SSL_METHOD *dtls1_get_client_method(int ver); | 1058 | const SSL_METHOD *dtls1_get_client_method(int ver); |
1057 | const SSL_METHOD *dtls1_get_server_method(int ver); | 1059 | const SSL_METHOD *dtls1_get_server_method(int ver); |