proposal: Add prefix for additional key exchanges when logging proposals

This commit is contained in:
Tobias Brunner 2020-10-22 14:15:31 +02:00 committed by Andreas Steffen
parent 9aff25ad47
commit 55ab7e1949

View File

@ -845,7 +845,7 @@ static int print_alg(private_proposal_t *this, printf_hook_data_t *data,
enumerator = array_create_enumerator(this->transforms);
while (enumerator->enumerate(enumerator, &entry))
{
char *prefix = "/";
char *prefix = "/", ake_prefix[5] = "";
if (type != entry->type)
{
@ -856,14 +856,19 @@ static int print_alg(private_proposal_t *this, printf_hook_data_t *data,
prefix = "";
*first = FALSE;
}
if (is_ke_transform(type) && type != KEY_EXCHANGE_METHOD)
{
sprintf(ake_prefix, "KE%d_", type - ADDITIONAL_KEY_EXCHANGE_1 + 1);
}
if (names)
{
written += print_in_hook(data, "%s%N", prefix, names, entry->alg);
written += print_in_hook(data, "%s%s%N", prefix, ake_prefix,
names, entry->alg);
}
else
{
written += print_in_hook(data, "%sUNKNOWN_%u_%u", prefix,
entry->type, entry->alg);
written += print_in_hook(data, "%s%sUNKNOWN_%u_%u", prefix,
ake_prefix, entry->type, entry->alg);
}
if (entry->key_size)
{