denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tls-crypto: Correctly filter cipher suites based on PRF algorithms

Browse Source 
The previous check operated on the first array element.
This commit is contained in:
Tobias Brunner
2021-02-12 11:45:44 +01:00
parent b7ea969b32
commit 436571b2f0
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtls/tls_crypto.c
+10 -9
View File
@@ -823,8 +823,12 @@ static void filter_suite(suite_algs_t suites[], int *count, int offset,
} }
} }
if (current.prf && current.prf != suites[i].prf) if (current.prf && current.prf != suites[i].prf)
{ /* skip, PRF does not match */ {
continue; if (suites[i].prf != PRF_UNDEFINED)
{
/* skip, PRF does not match nor is it undefined */
continue;
}
} }
if (current.hash && current.hash != suites[i].hash) if (current.hash && current.hash != suites[i].hash)
{ /* skip, hash does not match */ { /* skip, hash does not match */
@@ -1108,13 +1112,10 @@ static void filter_specific_config_suites(private_tls_crypto_t *this,
static void filter_unsupported_suites(suite_algs_t suites[], int *count) static void filter_unsupported_suites(suite_algs_t suites[], int *count)
{ {
/* filter suite list by each algorithm */ /* filter suite list by each algorithm */
if (suites->tls_version < TLS_1_3) filter_suite(suites, count, offsetof(suite_algs_t, encr),
{ lib->crypto->create_aead_enumerator);
filter_suite(suites, count, offsetof(suite_algs_t, encr), filter_suite(suites, count, offsetof(suite_algs_t, prf),
lib->crypto->create_aead_enumerator); lib->crypto->create_prf_enumerator);
filter_suite(suites, count, offsetof(suite_algs_t, prf),
lib->crypto->create_prf_enumerator);
}
filter_suite(suites, count, offsetof(suite_algs_t, encr), filter_suite(suites, count, offsetof(suite_algs_t, encr),
lib->crypto->create_crypter_enumerator); lib->crypto->create_crypter_enumerator);
filter_suite(suites, count, offsetof(suite_algs_t, mac), filter_suite(suites, count, offsetof(suite_algs_t, mac),