diff options
author | tb <> | 2022-06-29 20:04:28 +0000 |
---|---|---|
committer | tb <> | 2022-06-29 20:04:28 +0000 |
commit | 3fea5b8f156b0f6938854f06889198450a477b37 (patch) | |
tree | 18f3d12e5373f95fffa5674634fc8a75e8f914ab /src/lib/libssl/ssl_locl.h | |
parent | fc8a9f3799769566fe4b424c43a81a1a71f91328 (diff) | |
download | openbsd-3fea5b8f156b0f6938854f06889198450a477b37.tar.gz openbsd-3fea5b8f156b0f6938854f06889198450a477b37.tar.bz2 openbsd-3fea5b8f156b0f6938854f06889198450a477b37.zip |
Parse the @SECLEVEL=n annotation in cipher strings
To this end, hand the SSL_CERT through about 5 levels of indirection to
set an integer on it.
ok beck jsing
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 102f7deaf5..d979baf301 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.402 2022/06/29 17:39:20 beck Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.403 2022/06/29 20:04:28 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 | * |
@@ -1311,7 +1311,7 @@ int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *ciphers, CBB *cbb); | |||
1311 | STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, CBS *cbs); | 1311 | STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, CBS *cbs); |
1312 | STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth, | 1312 | STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *meth, |
1313 | STACK_OF(SSL_CIPHER) **pref, STACK_OF(SSL_CIPHER) *tls13, | 1313 | STACK_OF(SSL_CIPHER) **pref, STACK_OF(SSL_CIPHER) *tls13, |
1314 | const char *rule_str); | 1314 | const char *rule_str, SSL_CERT *cert); |
1315 | int ssl_parse_ciphersuites(STACK_OF(SSL_CIPHER) **out_ciphers, const char *str); | 1315 | int ssl_parse_ciphersuites(STACK_OF(SSL_CIPHER) **out_ciphers, const char *str); |
1316 | int ssl_merge_cipherlists(STACK_OF(SSL_CIPHER) *cipherlist, | 1316 | int ssl_merge_cipherlists(STACK_OF(SSL_CIPHER) *cipherlist, |
1317 | STACK_OF(SSL_CIPHER) *cipherlist_tls13, | 1317 | STACK_OF(SSL_CIPHER) *cipherlist_tls13, |