mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-06 20:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the cipher_overhead_test

Browse Source 
Now that libssl no longer has any OPENSSL_NO_ALG guards the internal
cipher_overhead_test wasn't quite handling disabled ciphers correctly.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13916)
This commit is contained in:
Matt Caswell 2021-02-01 15:15:10 +00:00
parent e376242d28
commit 5682e77dff
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/cipher_overhead_test.c
View File

@ -11,6 +11,25 @@
#include "testutil.h"
#include "../ssl/ssl_local.h"
static int cipher_enabled(const SSL_CIPHER *ciph)
{
/*
* ssl_cipher_get_overhead() actually works with AEAD ciphers even if the
* underlying implementation is not present.
*/
if ((ciph->algorithm_mac & SSL_AEAD) != 0)
return 1;
if (ciph->algorithm_enc != SSL_eNULL
&& EVP_get_cipherbynid(SSL_CIPHER_get_cipher_nid(ciph)) == NULL)
return 0;
if (EVP_get_digestbynid(SSL_CIPHER_get_digest_nid(ciph)) == NULL)
return 0;
return 1;
}
static int cipher_overhead(void)
{
int ret = 1, i, n = ssl3_num_ciphers();
@ -21,6 +40,10 @@ static int cipher_overhead(void)
ciph = ssl3_get_cipher(i);
if (!ciph->min_dtls)
continue;
if (!cipher_enabled(ciph)) {
TEST_skip("Skipping disabled cipher %s", ciph->name);
continue;
}
if (!TEST_true(ssl_cipher_get_overhead(ciph, &mac, &in, &blk, &ex))) {
TEST_info("Failed getting %s", ciph->name);
ret = 0;