Added stub for IKEv1 keymat_t implementation.

diff --git a/src/libcharon/Makefile.am b/src/libcharon/Makefile.am
index 6607bb0173c38963487e849e6a177958df7f64fa..c4ba18c5ff03a9bd3119d2e48b8dc910e17c0bad 100644 (file)
--- a/src/libcharon/Makefile.am
+++ b/src/libcharon/Makefile.am
@@ -70,6 +70,7 @@ sa/ike_sa_manager.c sa/ike_sa_manager.h \
 sa/task_manager.h sa/task_manager_v2.c sa/task_manager_v2.h \
 sa/task_manager_v1.c sa/task_manager_v1.h \
 sa/keymat.h sa/keymat_v2.c sa/keymat_v2.h \
+sa/keymat_v1.c sa/keymat_v1.h \
 sa/shunt_manager.c sa/shunt_manager.h \
 sa/trap_manager.c sa/trap_manager.h \
 sa/tasks/child_create.c sa/tasks/child_create.h \

diff --git a/src/libcharon/sa/keymat_v1.c b/src/libcharon/sa/keymat_v1.c
new file mode 100644 (file)
index 0000000..f73366d
--- /dev/null
+++ b/src/libcharon/sa/keymat_v1.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2011 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "keymat_v1.h"
+
+#include <daemon.h>
+
+typedef struct private_keymat_v1_t private_keymat_v1_t;
+
+/**
+ * Private data of an keymat_t object.
+ */
+struct private_keymat_v1_t {
+
+       /**
+        * Public keymat_v1_t interface.
+        */
+       keymat_v1_t public;
+
+       /**
+        * IKE_SA Role, initiator or responder
+        */
+       bool initiator;
+
+       /**
+        * General purpose PRF
+        */
+       prf_t *prf;
+
+       /**
+        * Negotiated PRF algorithm
+        */
+       pseudo_random_function_t prf_alg;
+
+};
+
+METHOD(keymat_t, create_dh, diffie_hellman_t*,
+       private_keymat_v1_t *this, diffie_hellman_group_t group)
+{
+       return lib->crypto->create_dh(lib->crypto, group);;
+}
+
+METHOD(keymat_t, derive_ike_keys, bool,
+       private_keymat_v1_t *this, proposal_t *proposal, diffie_hellman_t *dh,
+       chunk_t nonce_i, chunk_t nonce_r, ike_sa_id_t *id,
+       pseudo_random_function_t rekey_function, chunk_t rekey_skd)
+{
+       return FALSE;
+}
+
+METHOD(keymat_t, derive_child_keys, bool,
+       private_keymat_v1_t *this, proposal_t *proposal, diffie_hellman_t *dh,
+       chunk_t nonce_i, chunk_t nonce_r, chunk_t *encr_i, chunk_t *integ_i,
+       chunk_t *encr_r, chunk_t *integ_r)
+{
+       return FALSE;
+}
+
+METHOD(keymat_t, get_skd, pseudo_random_function_t,
+       private_keymat_v1_t *this, chunk_t *skd)
+{
+       *skd = chunk_empty;
+       return this->prf_alg;
+}
+
+METHOD(keymat_t, get_aead, aead_t*,
+       private_keymat_v1_t *this, bool in)
+{
+       return NULL;
+}
+
+METHOD(keymat_t, get_auth_octets, chunk_t,
+       private_keymat_v1_t *this, bool verify, chunk_t ike_sa_init,
+       chunk_t nonce, identification_t *id, char reserved[3])
+{
+       return chunk_empty;
+}
+
+METHOD(keymat_t, get_psk_sig, chunk_t,
+       private_keymat_v1_t *this, bool verify, chunk_t ike_sa_init,
+       chunk_t nonce, chunk_t secret, identification_t *id, char reserved[3])
+{
+       return chunk_empty;
+}
+
+METHOD(keymat_t, destroy, void,
+       private_keymat_v1_t *this)
+{
+       DESTROY_IF(this->prf);
+       free(this);
+}
+
+/**
+ * See header
+ */
+keymat_v1_t *keymat_v1_create(bool initiator)
+{
+       private_keymat_v1_t *this;
+
+       INIT(this,
+               .public = {
+                       .keymat = {
+                               .create_dh = _create_dh,
+                               .derive_ike_keys = _derive_ike_keys,
+                               .derive_child_keys = _derive_child_keys,
+                               .get_skd = _get_skd,
+                               .get_aead = _get_aead,
+                               .get_auth_octets = _get_auth_octets,
+                               .get_psk_sig = _get_psk_sig,
+                               .destroy = _destroy,
+                       },
+               },
+               .initiator = initiator,
+               .prf_alg = PRF_UNDEFINED,
+       );
+
+       return &this->public;
+}

diff --git a/src/libcharon/sa/keymat_v1.h b/src/libcharon/sa/keymat_v1.h
new file mode 100644 (file)
index 0000000..68057fa
--- /dev/null
+++ b/src/libcharon/sa/keymat_v1.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011 Tobias Brunner
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup keymat_v1 keymat_v1
+ * @{ @ingroup sa
+ */
+
+#ifndef KEYMAT_V1_H_
+#define KEYMAT_V1_H_
+
+#include <sa/keymat.h>
+
+typedef struct keymat_v1_t keymat_v1_t;
+
+/**
+ * Derivation and management of sensitive keying material, IKEv1 variant.
+ */
+struct keymat_v1_t {
+
+       /**
+        * Implements keymat_t.
+        */
+       keymat_t keymat;
+};
+
+/**
+ * Create a keymat instance.
+ *
+ * @param initiator                    TRUE if we are the initiator
+ * @return                                     keymat instance
+ */
+keymat_v1_t *keymat_v1_create(bool initiator);
+
+#endif /** KEYMAT_V1_H_ @}*/