aboutsummaryrefslogtreecommitdiffstats
path: root/main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-11-19 22:14:30 +0200
committerTimo Teräs <timo.teras@iki.fi>2015-11-19 22:14:30 +0200
commit3adb6561f830cc6f7eade5e2c465e3f51bb0324e (patch)
treef521cc7c9ba1f296a5b6b286f0fad82b05855dd0 /main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch
parent84467229491d390cbbc0d77fb6bab3d92543b361 (diff)
downloadaports-3adb6561f830cc6f7eade5e2c465e3f51bb0324e.tar.bz2
aports-3adb6561f830cc6f7eade5e2c465e3f51bb0324e.tar.xz
main/strongswan: security upgrade to 5.3.4 (CVE-2015-8023)
Diffstat (limited to 'main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch')
-rw-r--r--main/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch20
1 files changed, 10 insertions, 10 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 8caabd063c..792d11381e 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,4 +1,4 @@
-From 2a175cc40c5754b803ccfe3f641b438f54b569ec Mon Sep 17 00:00:00 2001
+From b24d03c86cedbaa8d2c89ab98aab9f974e4d4f27 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] vici: send certificates for ike-sa events
@@ -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 98d264f..5245afc 100644
+index 9a3d832..e66ef45 100644
--- a/src/libcharon/plugins/vici/vici_query.c
+++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -225,13 +225,15 @@ static void list_task_queue(private_vici_query_t *this, vici_builder_t *b,
+@@ -264,13 +264,15 @@ 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,
@@ -32,7 +32,7 @@ index 98d264f..5245afc 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));
-@@ -239,9 +241,41 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
+@@ -278,9 +280,41 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
b->add_kv(b, "local-host", "%H", ike_sa->get_my_host(ike_sa));
b->add_kv(b, "local-id", "%Y", ike_sa->get_my_id(ike_sa));
@@ -74,7 +74,7 @@ index 98d264f..5245afc 100644
eap = ike_sa->get_other_eap_id(ike_sa);
-@@ -348,7 +382,7 @@ CALLBACK(list_sas, vici_message_t*,
+@@ -395,7 +429,7 @@ CALLBACK(list_sas, vici_message_t*,
b = vici_builder_create();
b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -83,7 +83,7 @@ index 98d264f..5245afc 100644
b->begin_section(b, "child-sas");
csas = ike_sa->create_child_sa_enumerator(ike_sa);
-@@ -1063,7 +1097,7 @@ METHOD(listener_t, ike_updown, bool,
+@@ -1110,7 +1144,7 @@ METHOD(listener_t, ike_updown, bool,
}
b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -92,7 +92,7 @@ index 98d264f..5245afc 100644
b->end_section(b);
this->dispatcher->raise_event(this->dispatcher,
-@@ -1088,10 +1122,10 @@ METHOD(listener_t, ike_rekey, bool,
+@@ -1135,10 +1169,10 @@ METHOD(listener_t, ike_rekey, bool,
b = vici_builder_create();
b->begin_section(b, old->get_name(old));
b->begin_section(b, "old");
@@ -105,7 +105,7 @@ index 98d264f..5245afc 100644
b->end_section(b);
b->end_section(b);
-@@ -1121,7 +1155,7 @@ METHOD(listener_t, child_updown, bool,
+@@ -1168,7 +1202,7 @@ METHOD(listener_t, child_updown, bool,
}
b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -114,7 +114,7 @@ index 98d264f..5245afc 100644
b->begin_section(b, "child-sas");
b->begin_section(b, child_sa->get_name(child_sa));
-@@ -1153,7 +1187,7 @@ METHOD(listener_t, child_rekey, bool,
+@@ -1200,7 +1234,7 @@ METHOD(listener_t, child_rekey, bool,
b = vici_builder_create();
b->begin_section(b, ike_sa->get_name(ike_sa));
@@ -124,5 +124,5 @@ index 98d264f..5245afc 100644
b->begin_section(b, old->get_name(old));
--
-2.5.3
+2.6.3