From: Martin Willi <martin@revosec.ch>
Date: Mon, 7 Jun 2010 12:56:24 +0000 (+0200)
Subject: Reacquire keymat from new IKE_SA during task migration
X-Git-Tag: 4.4.1~178
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b56ec20f365f8f9d8ea4174eaa88c86dc5687e8;p=thirdparty%2Fstrongswan.git

Reacquire keymat from new IKE_SA during task migration
---

diff --git a/src/libcharon/sa/tasks/ike_init.c b/src/libcharon/sa/tasks/ike_init.c
index 5eb33b5408..38fb572f44 100644
--- a/src/libcharon/sa/tasks/ike_init.c
+++ b/src/libcharon/sa/tasks/ike_init.c
@@ -543,6 +543,7 @@ static void migrate(private_ike_init_t *this, ike_sa_t *ike_sa)
 	chunk_free(&this->other_nonce);
 
 	this->ike_sa = ike_sa;
+	this->keymat = ike_sa->get_keymat(ike_sa);
 	this->proposal = NULL;
 	DESTROY_IF(this->dh);
 	this->dh = this->keymat->create_dh(this->keymat, this->dh_group);