From 24e72a311aadfdd912754f362b57df598e7fe1c5 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Tue, 19 May 2009 16:02:50 +0200
Subject: [PATCH] status output of 3DES_CBC without key length

---
 src/pluto/ike_alg.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/pluto/ike_alg.c b/src/pluto/ike_alg.c
index 8c858ad12..30a69d3cf 100644
--- a/src/pluto/ike_alg.c
+++ b/src/pluto/ike_alg.c
@@ -320,15 +320,27 @@ void ike_alg_show_connection(struct connection *c, const char *instance)
 
 	if (st)
 	{
-		whack_log(RC_COMMENT
-				, "\"%s\"%s:   IKE proposal: %s_%d/%s/%s"
-				, c->name
-				, instance
-				, enum_show(&oakley_enc_names, st->st_oakley.encrypt)
-				, st->st_oakley.enckeylen
-				, enum_show(&oakley_hash_names, st->st_oakley.hash)
-				, enum_show(&oakley_group_names, st->st_oakley.group->group)
-		);
+		if (st->st_oakley.encrypt == OAKLEY_3DES_CBC)
+		{
+			whack_log(RC_COMMENT,
+					"\"%s\"%s:   IKE proposal: %s/%s/%s",
+					c->name, instance,
+					enum_show(&oakley_enc_names, st->st_oakley.encrypt),
+					enum_show(&oakley_hash_names, st->st_oakley.hash),
+					enum_show(&oakley_group_names, st->st_oakley.group->group)
+			);
+		}
+		else
+		{
+			whack_log(RC_COMMENT,
+					"\"%s\"%s:   IKE proposal: %s_%u/%s/%s",
+					c->name, instance,
+					enum_show(&oakley_enc_names, st->st_oakley.encrypt),
+					st->st_oakley.enckeylen,
+					enum_show(&oakley_hash_names, st->st_oakley.hash),
+					enum_show(&oakley_group_names, st->st_oakley.group->group)
+			);
+		}
 	}
 }