From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 22 Oct 2020 12:15:31 +0000 (+0200)
Subject: proposal: Add prefix for additional key exchanges when logging proposals
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f89557f873ec195274127cfbcdee9416a428a041;p=thirdparty%2Fstrongswan.git

proposal: Add prefix for additional key exchanges when logging proposals
---

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)
 		{