From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sat, 19 Dec 2015 09:30:17 +0000 (+0100)
Subject: vici: allow legacy shortcuts in cert queries
X-Git-Tag: 5.4.0dr3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92b051bd4a00d1be0dc061f20b865d31dd5b014d;p=thirdparty%2Fstrongswan.git

vici: allow legacy shortcuts in cert queries
---

diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
index 76cfb52f94..f488a425a4 100644
--- a/src/libcharon/plugins/vici/vici_query.c
+++ b/src/libcharon/plugins/vici/vici_query.c
@@ -40,6 +40,7 @@
 
 #include "vici_query.h"
 #include "vici_builder.h"
+#include "vici_cert_info.h"
 
 #include <inttypes.h>
 #include <time.h>
@@ -961,20 +962,23 @@ CALLBACK(list_certs, vici_message_t*,
 	char *str;
 
 	str = request->get_str(request, "ANY", "type");
-	if (!enum_from_name(certificate_type_names, str, &filter.type))
+	if (enum_from_name(certificate_type_names, str, &filter.type))
 	{
-		DBG1(DBG_CFG, "invalid certificate type '%s'", str);
-		goto finalize;
-	}
-	if (filter.type == CERT_X509)
-	{
-		str = request->get_str(request, "ANY", "flag");
-		if (!enum_from_name(x509_flag_names, str, &filter.flag))
+		if (filter.type == CERT_X509)
 		{
-			DBG1(DBG_CFG, "invalid certificate flag '%s'", str);
-			goto finalize;
+			str = request->get_str(request, "ANY", "flag");
+			if (!enum_from_name(x509_flag_names, str, &filter.flag))
+			{
+				DBG1(DBG_CFG, "invalid certificate flag '%s'", str);
+				goto finalize;
+			}
 		}
 	}
+	else if	(!vici_cert_info_from_str(str, &filter.type, &filter.flag))
+	{
+		DBG1(DBG_CFG, "invalid certificate type '%s'", str);
+		goto finalize;
+	}
 
 	str = request->get_str(request, NULL, "subject");
 	if (str)