denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vici: allow legacy shortcuts in cert queries

Browse Source
This commit is contained in:
Andreas Steffen
2015-12-19 10:30:17 +01:00
parent 6943db5679
commit 92b051bd4a
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_query.c
+14 -10
View File
@@ -40,6 +40,7 @@
#include "vici_query.h" #include "vici_query.h"
#include "vici_builder.h" #include "vici_builder.h"
#include "vici_cert_info.h"
#include <inttypes.h> #include <inttypes.h>
#include <time.h> #include <time.h>
@@ -961,20 +962,23 @@ CALLBACK(list_certs, vici_message_t*,
char *str; char *str;
str = request->get_str(request, "ANY", "type"); 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))
{
if (filter.type == CERT_X509)
{
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); DBG1(DBG_CFG, "invalid certificate type '%s'", str);
goto finalize; goto finalize;
} }
if (filter.type == CERT_X509)
{
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;
}
}
str = request->get_str(request, NULL, "subject"); str = request->get_str(request, NULL, "subject");
if (str) if (str)