main/strongswan: upgrade to 5.5.2

1 files changed, 12 insertions, 12 deletions

diff --git a/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch b/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch
index a69d162407..34d9b44d61 100644
--- a/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch
+++ b/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch
@@ -1,7 +1,7 @@
-From cc2ce031ea6a8b6d85331804b29335a9470765f3 Mon Sep 17 00:00:00 2001
+From 61556ac61b9d7c564dfe13d5cf549a53f889ae36 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
 Date: Mon, 21 Sep 2015 13:42:05 +0300
-Subject: [PATCH 3/5] vici: send certificates for ike-sa events
+Subject: [PATCH] vici: send certificates for ike-sa events
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,10 +12,10 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi>
  1 file changed, 41 insertions(+), 7 deletions(-)
 
 diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index 04cea00..89655f1 100644
+index c0f4e2de9..309a11c03 100644
 --- a/src/libcharon/plugins/vici/vici_query.c
 +++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -266,7 +266,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b,
+@@ -305,7 +305,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b,
   * List details of an IKE_SA
   */
  static void list_ike(private_vici_query_t *this, vici_builder_t *b,
@@ -24,7 +24,7 @@ index 04cea00..89655f1 100644
  {
  	time_t t;
  	ike_sa_id_t *id;
-@@ -274,6 +274,8 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
+@@ -313,6 +313,8 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
  	proposal_t *proposal;
  	uint16_t alg, ks;
  	host_t *host;
@@ -33,7 +33,7 @@ index 04cea00..89655f1 100644
  
  	b->add_kv(b, "uniqueid", "%u", ike_sa->get_unique_id(ike_sa));
  	b->add_kv(b, "version", "%u", ike_sa->get_version(ike_sa));
-@@ -283,11 +285,43 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
+@@ -322,11 +324,43 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
  	b->add_kv(b, "local-host", "%H", host);
  	b->add_kv(b, "local-port", "%d", host->get_port(host));
  	b->add_kv(b, "local-id", "%Y", ike_sa->get_my_id(ike_sa));
@@ -77,7 +77,7 @@ index 04cea00..89655f1 100644
  
  	eap = ike_sa->get_other_eap_id(ike_sa);
  
-@@ -404,7 +438,7 @@ CALLBACK(list_sas, vici_message_t*,
+@@ -444,7 +478,7 @@ CALLBACK(list_sas, vici_message_t*,
  		b = vici_builder_create();
  		b->begin_section(b, ike_sa->get_name(ike_sa));
  
@@ -86,7 +86,7 @@ index 04cea00..89655f1 100644
  
  		b->begin_section(b, "child-sas");
  		csas = ike_sa->create_child_sa_enumerator(ike_sa);
-@@ -1378,7 +1412,7 @@ METHOD(listener_t, ike_updown, bool,
+@@ -1448,7 +1482,7 @@ METHOD(listener_t, ike_updown, bool,
  	}
  
  	b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -95,7 +95,7 @@ index 04cea00..89655f1 100644
  	b->end_section(b);
  
  	this->dispatcher->raise_event(this->dispatcher,
-@@ -1403,10 +1437,10 @@ METHOD(listener_t, ike_rekey, bool,
+@@ -1473,10 +1507,10 @@ METHOD(listener_t, ike_rekey, bool,
  	b = vici_builder_create();
  	b->begin_section(b, old->get_name(old));
  	b->begin_section(b, "old");
@@ -108,7 +108,7 @@ index 04cea00..89655f1 100644
  	b->end_section(b);
  	b->end_section(b);
  
-@@ -1436,7 +1470,7 @@ METHOD(listener_t, child_updown, bool,
+@@ -1506,7 +1540,7 @@ METHOD(listener_t, child_updown, bool,
  	}
  
  	b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -117,7 +117,7 @@ index 04cea00..89655f1 100644
  	b->begin_section(b, "child-sas");
  
  	b->begin_section(b, child_sa->get_name(child_sa));
-@@ -1468,7 +1502,7 @@ METHOD(listener_t, child_rekey, bool,
+@@ -1538,7 +1572,7 @@ METHOD(listener_t, child_rekey, bool,
  	b = vici_builder_create();
  
  	b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -127,5 +127,5 @@ index 04cea00..89655f1 100644
  
  	b->begin_section(b, old->get_name(old));
 -- 
-2.5.0
+2.12.1