tkm: Implement hash algorithm storage methods of keymat_v2_t interface

diff --git a/src/charon-tkm/src/tkm/tkm_keymat.c b/src/charon-tkm/src/tkm/tkm_keymat.c
index 772fac8b04b5d72bc970c8f3839fc6230a71b992..80721fafeb4afaaf840e6a34e4c3415601d96592 100644 (file)
--- a/src/charon-tkm/src/tkm/tkm_keymat.c
+++ b/src/charon-tkm/src/tkm/tkm_keymat.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2015 Tobias Brunner
  * Copyrigth (C) 2012 Reto Buerki
  * Copyright (C) 2012 Adrian-Ken Rueegsegger
  * Hochschule fuer Technik Rapperswil
@@ -17,6 +18,7 @@
 #include <daemon.h>
 #include <tkm/constants.h>
 #include <tkm/client.h>
+#include <crypto/hashers/hash_algorithm_set.h>
 
 #include "tkm.h"
 #include "tkm_types.h"
@@ -71,6 +73,10 @@ struct private_tkm_keymat_t {
         */
        chunk_t other_init_msg;
 
+       /**
+        * Set of hash algorithms supported by peer for signature authentication
+        */
+       hash_algorithm_set_t *hash_algorithms;
 };
 
 /**
@@ -417,6 +423,26 @@ METHOD(keymat_v2_t, get_psk_sig, bool,
        return FALSE;
 }
 
+METHOD(keymat_v2_t, hash_algorithm_supported, bool,
+       private_tkm_keymat_t *this, hash_algorithm_t hash)
+{
+       if (!this->hash_algorithms)
+       {
+               return FALSE;
+       }
+       return this->hash_algorithms->contains(this->hash_algorithms, hash);
+}
+
+METHOD(keymat_v2_t, add_hash_algorithm, void,
+       private_tkm_keymat_t *this, hash_algorithm_t hash)
+{
+       if (!this->hash_algorithms)
+       {
+               this->hash_algorithms = hash_algorithm_set_create();
+       }
+       this->hash_algorithms->add(this->hash_algorithms, hash);
+}
+
 METHOD(keymat_t, destroy, void,
        private_tkm_keymat_t *this)
 {
@@ -435,6 +461,7 @@ METHOD(keymat_t, destroy, void,
                tkm->idmgr->release_id(tkm->idmgr, TKM_CTX_AE, this->ae_ctx_id);
        }
 
+       DESTROY_IF(this->hash_algorithms);
        DESTROY_IF(this->aead_in);
        DESTROY_IF(this->aead_out);
        chunk_free(&this->auth_payload);
@@ -488,6 +515,8 @@ tkm_keymat_t *tkm_keymat_create(bool initiator)
                                .get_skd = _get_skd,
                                .get_auth_octets = _get_auth_octets,
                                .get_psk_sig = _get_psk_sig,
+                               .add_hash_algorithm = _add_hash_algorithm,
+                               .hash_algorithm_supported = _hash_algorithm_supported,
                        },
                        .get_isa_id = _get_isa_id,
                        .set_auth_payload = _set_auth_payload,