Updated HA plugin to new IKEv2 specific keymat functions

diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 71c458a89f3177aaf14293eefd2c8a62cfa65da4..5f48143b7c08ae6bfeedd97c93230ea23d8e0dab 100644 (file)
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -16,6 +16,7 @@
 #include "ha_dispatcher.h"
 
 #include <daemon.h>
+#include <sa/ikev2/keymat_v2.h>
 #include <processing/jobs/callback_job.h>
 
 typedef struct private_ha_dispatcher_t private_ha_dispatcher_t;
@@ -82,6 +83,7 @@ static void process_ike_add(private_ha_dispatcher_t *this, ha_message_t *message
        u_int16_t encr = 0, len = 0, integ = 0, prf = 0, old_prf = PRF_UNDEFINED;
        chunk_t nonce_i = chunk_empty, nonce_r = chunk_empty;
        chunk_t secret = chunk_empty, old_skd = chunk_empty;
+       bool ok = FALSE;
 
        enumerator = message->create_attribute_enumerator(message);
        while (enumerator->enumerate(enumerator, &attribute, &value))
@@ -132,13 +134,11 @@ static void process_ike_add(private_ha_dispatcher_t *this, ha_message_t *message
        if (ike_sa)
        {
                proposal_t *proposal;
-               keymat_t *keymat;
                /* quick and dirty hack of a DH implementation ;-) */
                diffie_hellman_t dh = { .get_shared_secret = get_shared_secret,
                                                                .destroy = (void*)&secret };
 
                proposal = proposal_create(PROTO_IKE, 0);
-               keymat = ike_sa->get_keymat(ike_sa);
                if (integ)
                {
                        proposal->add_algorithm(proposal, INTEGRITY_ALGORITHM, integ, 0);
@@ -152,8 +152,14 @@ static void process_ike_add(private_ha_dispatcher_t *this, ha_message_t *message
                        proposal->add_algorithm(proposal, PSEUDO_RANDOM_FUNCTION, prf, 0);
                }
                charon->bus->set_sa(charon->bus, ike_sa);
-               if (keymat->derive_ike_keys(keymat, proposal, &dh, nonce_i, nonce_r,
-                                                                        ike_sa->get_id(ike_sa), old_prf, old_skd))
+               if (ike_sa->get_version(ike_sa) == IKEV2)
+               {
+                       keymat_v2_t *keymat_v2 = (keymat_v2_t*)ike_sa->get_keymat(ike_sa);
+
+                       ok = keymat_v2->derive_ike_keys(keymat_v2, proposal, &dh, nonce_i,
+                                                       nonce_r, ike_sa->get_id(ike_sa), old_prf, old_skd);
+               }
+               if (ok)
                {
                        if (old_sa)
                        {
@@ -462,8 +468,7 @@ static void process_child_add(private_ha_dispatcher_t *this,
        child_cfg_t *config = NULL;
        child_sa_t *child_sa;
        proposal_t *proposal;
-       keymat_t *keymat;
-       bool initiator = FALSE, failed = FALSE;
+       bool initiator = FALSE, failed = FALSE, ok = FALSE;
        u_int32_t inbound_spi = 0, outbound_spi = 0;
        u_int16_t inbound_cpi = 0, outbound_cpi = 0;
        u_int8_t mode = MODE_TUNNEL, ipcomp = 0;
@@ -569,10 +574,15 @@ static void process_child_add(private_ha_dispatcher_t *this,
                proposal->add_algorithm(proposal, ENCRYPTION_ALGORITHM, encr, len);
        }
        proposal->add_algorithm(proposal, EXTENDED_SEQUENCE_NUMBERS, esn, 0);
-       keymat = ike_sa->get_keymat(ike_sa);
+       if (ike_sa->get_version(ike_sa) == IKEV2)
+       {
+               keymat_v2_t *keymat_v2 = (keymat_v2_t*)ike_sa->get_keymat(ike_sa);
 
-       if (!keymat->derive_child_keys(keymat, proposal, secret.ptr ? &dh : NULL,
-                                       nonce_i, nonce_r, &encr_i, &integ_i, &encr_r, &integ_r))
+               ok = keymat_v2->derive_child_keys(keymat_v2,
+                                               proposal, secret.ptr ? &dh : NULL, nonce_i, nonce_r,
+                                               &encr_i, &integ_i, &encr_r, &integ_r);
+       }
+       if (!ok)
        {
                DBG1(DBG_CHD, "HA CHILD_SA key derivation failed");
                child_sa->destroy(child_sa);

diff --git a/src/libcharon/plugins/ha/ha_ike.c b/src/libcharon/plugins/ha/ha_ike.c
index ce106713430fc34beddf280c359443d869f9f19a..7da11b55827c08dc6e4c2acb826a166316c22b4c 100644 (file)
--- a/src/libcharon/plugins/ha/ha_ike.c
+++ b/src/libcharon/plugins/ha/ha_ike.c
@@ -15,6 +15,8 @@
 
 #include "ha_ike.h"
 
+#include <sa/ikev2/keymat_v2.h>
+
 typedef struct private_ha_ike_t private_ha_ike_t;
 
 /**
@@ -88,12 +90,12 @@ METHOD(listener_t, ike_keys, bool,
        m = ha_message_create(HA_IKE_ADD);
        m->add_attribute(m, HA_IKE_ID, ike_sa->get_id(ike_sa));
 
-       if (rekey)
+       if (rekey && rekey->get_version(rekey) == IKEV2)
        {
                chunk_t skd;
-               keymat_t *keymat;
+               keymat_v2_t *keymat;
 
-               keymat = rekey->get_keymat(rekey);
+               keymat = (keymat_v2_t*)rekey->get_keymat(rekey);
                m->add_attribute(m, HA_IKE_REKEY_ID, rekey->get_id(rekey));
                m->add_attribute(m, HA_ALG_OLD_PRF, keymat->get_skd(keymat, &skd));
                m->add_attribute(m, HA_OLD_SKD, skd);