From: Martin Willi <martin@revosec.ch>
Date: Thu, 19 Jan 2012 14:55:29 +0000 (+0100)
Subject: Create IKEv1 keymat hasher explicitly on sync
X-Git-Tag: 5.0.0~338^2~9^2~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae92641806c1b45d266487590f13f622c0478d1d;p=thirdparty%2Fstrongswan.git

Create IKEv1 keymat hasher explicitly on sync
---

diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index b20ced473a..e3080c4490 100644
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -236,9 +236,12 @@ static void process_ike_add(private_ha_dispatcher_t *this, ha_message_t *message
 				method = AUTH_PSK;
 				shared = shared_key_create(SHARED_IKE, chunk_clone(psk));
 			}
-			ok = keymat_v1->derive_ike_keys(keymat_v1, proposal,
-							dh, dh_remote, nonce_i, nonce_r,
-							ike_sa->get_id(ike_sa), method, shared);
+			if (keymat_v1->create_hasher(keymat_v1, proposal))
+			{
+				ok = keymat_v1->derive_ike_keys(keymat_v1, proposal,
+								dh, dh_remote, nonce_i, nonce_r,
+								ike_sa->get_id(ike_sa), method, shared);
+			}
 			DESTROY_IF(shared);
 		}
 		dh->destroy(dh);