From 5d6b9815729e996a590a5ac8d30abc7fb688e046 Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@revosec.ch>
Date: Mon, 25 Jul 2011 14:08:18 +0200
Subject: [PATCH] Inherit authentication information during IKE_SA rekeying

---
 src/libcharon/sa/ike_sa.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index da429c884..243e11ede 100644
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1929,6 +1929,8 @@ METHOD(ike_sa_t, inherit, void,
 	private_ike_sa_t *other = (private_ike_sa_t*)other_public;
 	child_sa_t *child_sa;
 	attribute_entry_t *entry;
+	enumerator_t *enumerator;
+	auth_cfg_t *cfg;
 
 	/* apply hosts and ids */
 	this->my_host->destroy(this->my_host);
@@ -1952,6 +1954,20 @@ METHOD(ike_sa_t, inherit, void,
 		other->other_virtual_ip = NULL;
 	}
 
+	/* authentication information */
+	enumerator = other->my_auths->create_enumerator(other->my_auths);
+	while (enumerator->enumerate(enumerator, &cfg))
+	{
+		this->my_auths->insert_last(this->my_auths, cfg->clone(cfg));
+	}
+	enumerator->destroy(enumerator);
+	enumerator = other->other_auths->create_enumerator(other->other_auths);
+	while (enumerator->enumerate(enumerator, &cfg))
+	{
+		this->other_auths->insert_last(this->other_auths, cfg->clone(cfg));
+	}
+	enumerator->destroy(enumerator);
+
 	/* ... and configuration attributes */
 	while (other->attributes->remove_last(other->attributes,
 										  (void**)&entry) == SUCCESS)