From a846be311627f23e202bee65dae71d5731e53967 Mon Sep 17 00:00:00 2001
From: Clavister OpenSource <opensource@clavister.com>
Date: Mon, 5 Dec 2011 13:54:54 +0100
Subject: [PATCH] keymat: derive_ike_keys updated with XAUTH RSA:s

---
 src/libcharon/sa/keymat_v1.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 src/libcharon/sa/keymat_v1.c

diff --git a/src/libcharon/sa/keymat_v1.c b/src/libcharon/sa/keymat_v1.c
old mode 100644
new mode 100755
index fc49a2030..19d6a74ce
--- a/src/libcharon/sa/keymat_v1.c
+++ b/src/libcharon/sa/keymat_v1.c
@@ -426,8 +426,14 @@ METHOD(keymat_v1_t, derive_ike_keys, bool,
 			this->prf->allocate_bytes(this->prf, nonces, &this->skeyid);
 			break;
 		}
-		case AUTH_RSA:
 		case AUTH_XAUTH_INIT_RSA:
+		case AUTH_XAUTH_RESP_RSA:
+		{
+			this->prf->set_key(this->prf, nonces);
+			this->prf->allocate_bytes(this->prf, g_xy, &this->skeyid);
+			break;
+		}
+		case AUTH_RSA:
 		{
 			/* signatures : SKEYID = prf(Ni_b | Nr_b, g^xy)
 			 * pubkey encr: SKEYID = prf(hash(Ni_b | Nr_b), CKY-I | CKY-R) */