vici: list cert_policy parameter

diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
index 109944c160171df11bf3b489d629d494a4d6a349..78a77d271a2f801d989d73fc47e34e66b9e4122c 100644 (file)
--- a/src/libcharon/plugins/vici/vici_config.c
+++ b/src/libcharon/plugins/vici/vici_config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 revosec AG
  *
  * Copyright (C) 2015-2017 Tobias Brunner
- * Copyright (C) 2015-2016 Andreas Steffen
+ * Copyright (C) 2015-2018 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it

diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
index 82c3d7855452af7dbae47f9ec83ceda95975a4bd..4385cf606141232bdf49cc22f6dff07af3f84d9c 100644 (file)
--- a/src/libcharon/plugins/vici/vici_query.c
+++ b/src/libcharon/plugins/vici/vici_query.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2017 Tobias Brunner
- * Copyright (C) 2015 Andreas Steffen
+ * Copyright (C) 2015-2018 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * Copyright (C) 2014 Martin Willi
@@ -737,6 +737,18 @@ static void build_auth_cfgs(peer_cfg_t *peer_cfg, bool local, vici_builder_t *b)
                rules->destroy(rules);
                b->end_list(b);
 
+               b->begin_list(b, "cert_policy");
+               rules = auth->create_enumerator(auth);
+               while (rules->enumerate(rules, &rule, &v))
+               {
+                       if (rule == AUTH_RULE_CERT_POLICY)
+                       {
+                               b->add_li(b, "%s", v.str);
+                       }
+               }
+               rules->destroy(rules);
+               b->end_list(b);
+
                b->begin_list(b, "certs");
                rules = auth->create_enumerator(auth);
                while (rules->enumerate(rules, &rule, &v))

diff --git a/src/swanctl/commands/list_conns.c b/src/swanctl/commands/list_conns.c
index f692e9966fdd8bdc4de7f8202a4678e5faf4e2b3..ce903e50d151ebac65d9b48441021b62c51b06ba 100644 (file)
--- a/src/swanctl/commands/list_conns.c
+++ b/src/swanctl/commands/list_conns.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2014 Martin Willi
  * Copyright (C) 2014 revosec AG
  *
- * Copyright (C) 2016 Andreas Steffen
+ * Copyright (C) 2016-2018 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -199,6 +199,10 @@ CALLBACK(conn_sn, int,
                        {
                                printf("    groups: %s\n", auth->get(auth, "groups"));
                        }
+                       if (auth->get(auth, "cert_policy"))
+                       {
+                               printf("    cert policy: %s\n", auth->get(auth, "cert_policy"));
+                       }
                        if (auth->get(auth, "certs"))
                        {
                                printf("    certs: %s\n", auth->get(auth, "certs"));