From c5a6938b9e7cecb0ed250a607ca64d2413663523 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 22 Oct 2020 14:15:31 +0200 Subject: [PATCH] proposal: Add prefix for additional key exchanges when logging proposals --- src/libstrongswan/crypto/proposal/proposal.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/libstrongswan/crypto/proposal/proposal.c b/src/libstrongswan/crypto/proposal/proposal.c index ba6b3f0f2f..ff7884d9a3 100644 --- a/src/libstrongswan/crypto/proposal/proposal.c +++ b/src/libstrongswan/crypto/proposal/proposal.c @@ -849,7 +849,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) { @@ -860,14 +860,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) { -- 2.47.2