diff options
author | tb <> | 2022-07-02 16:31:04 +0000 |
---|---|---|
committer | tb <> | 2022-07-02 16:31:04 +0000 |
commit | 5d994915db5d0a0615b6618184d705dbf25a7473 (patch) | |
tree | bc3bde853323758696c370e558e602d43422a86d /src/lib/libssl/ssl_lib.c | |
parent | b6005b83ccc59320a316c38108b7b45ca4682fbd (diff) | |
download | openbsd-5d994915db5d0a0615b6618184d705dbf25a7473.tar.gz openbsd-5d994915db5d0a0615b6618184d705dbf25a7473.tar.bz2 openbsd-5d994915db5d0a0615b6618184d705dbf25a7473.zip |
Stop using ssl{_ctx,}_security() outside of ssl_seclevel.c
The API is ugly and we can easily abstract it away. The SSL_SECOP_* stuff
is now confined into ssl_seclevel.c and the rest of the library can make
use of the more straightforward wrappers, which makes it a lot easier on
the eyes.
ok beck jsing
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 609bfb7e65..2cdcef444c 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.294 2022/06/29 20:04:28 tb Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.295 2022/07/02 16:31:04 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 | * |
@@ -1471,8 +1471,7 @@ SSL_get1_supported_ciphers(SSL *s) | |||
1471 | if (!ssl_cipher_allowed_in_tls_version_range(cipher, min_vers, | 1471 | if (!ssl_cipher_allowed_in_tls_version_range(cipher, min_vers, |
1472 | max_vers)) | 1472 | max_vers)) |
1473 | continue; | 1473 | continue; |
1474 | if (!ssl_security(s, SSL_SECOP_CIPHER_SUPPORTED, | 1474 | if (!ssl_security_supported_cipher(s, cipher)) |
1475 | cipher->strength_bits, 0, cipher)) | ||
1476 | continue; | 1475 | continue; |
1477 | if (!sk_SSL_CIPHER_push(supported_ciphers, cipher)) | 1476 | if (!sk_SSL_CIPHER_push(supported_ciphers, cipher)) |
1478 | goto err; | 1477 | goto err; |