summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2022-06-29 08:39:08 +0000
committertb <>2022-06-29 08:39:08 +0000
commit1de11e7e8f780f3c0123b481a3ecf4d8ae835e20 (patch)
tree444ddfaa47ec601028465e29ebdacb764d9bb2c3 /src
parent8061d307c6ae52d10a70236d0f745ce9734e2620 (diff)
downloadopenbsd-1de11e7e8f780f3c0123b481a3ecf4d8ae835e20.tar.gz
openbsd-1de11e7e8f780f3c0123b481a3ecf4d8ae835e20.tar.bz2
openbsd-1de11e7e8f780f3c0123b481a3ecf4d8ae835e20.zip
Also check the security level in SSL_get1_supported_ciphers
ok beck jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/ssl_lib.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 2bbc8e54d0..be01f771e0 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.291 2022/06/28 20:34:17 tb Exp $ */ 1/* $OpenBSD: ssl_lib.c,v 1.292 2022/06/29 08:39:08 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 *
@@ -1449,7 +1449,7 @@ STACK_OF(SSL_CIPHER) *
1449SSL_get1_supported_ciphers(SSL *s) 1449SSL_get1_supported_ciphers(SSL *s)
1450{ 1450{
1451 STACK_OF(SSL_CIPHER) *supported_ciphers = NULL, *ciphers; 1451 STACK_OF(SSL_CIPHER) *supported_ciphers = NULL, *ciphers;
1452 const SSL_CIPHER *cipher; 1452 SSL_CIPHER *cipher;
1453 uint16_t min_vers, max_vers; 1453 uint16_t min_vers, max_vers;
1454 int i; 1454 int i;
1455 1455
@@ -1468,6 +1468,9 @@ SSL_get1_supported_ciphers(SSL *s)
1468 if (!ssl_cipher_allowed_in_tls_version_range(cipher, min_vers, 1468 if (!ssl_cipher_allowed_in_tls_version_range(cipher, min_vers,
1469 max_vers)) 1469 max_vers))
1470 continue; 1470 continue;
1471 if (!ssl_security(s, SSL_SECOP_CIPHER_SUPPORTED,
1472 cipher->strength_bits, 0, cipher))
1473 continue;
1471 if (!sk_SSL_CIPHER_push(supported_ciphers, cipher)) 1474 if (!sk_SSL_CIPHER_push(supported_ciphers, cipher))
1472 goto err; 1475 goto err;
1473 } 1476 }