aboutsummaryrefslogtreecommitdiffstats
path: root/Source/charon/config
diff options
context:
space:
mode:
Diffstat (limited to 'Source/charon/config')
-rw-r--r--Source/charon/config/child_proposal.c541
-rw-r--r--Source/charon/config/child_proposal.h239
-rw-r--r--Source/charon/config/child_proposal.obin0 -> 35520 bytes
-rw-r--r--Source/charon/config/configuration_manager.c127
-rw-r--r--Source/charon/config/sa_config.c6
-rw-r--r--Source/charon/config/sa_config.h11
6 files changed, 820 insertions, 104 deletions
diff --git a/Source/charon/config/child_proposal.c b/Source/charon/config/child_proposal.c
new file mode 100644
index 000000000..391c321f6
--- /dev/null
+++ b/Source/charon/config/child_proposal.c
@@ -0,0 +1,541 @@
+/**
+ * @file child_proposal.c
+ *
+ * @brief Implementation of child_proposal_t.
+ *
+ */
+
+/*
+ * Copyright (C) 2006 Martin Willi
+ * 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 "child_proposal.h"
+
+#include <utils/linked_list.h>
+#include <utils/allocator.h>
+#include <utils/identification.h>
+#include <utils/logger.h>
+
+
+/**
+ * String mappings for protocol_id_t.
+ */
+mapping_t protocol_id_m[] = {
+ {UNDEFINED_PROTOCOL_ID, "UNDEFINED_PROTOCOL_ID"},
+ {IKE, "IKE"},
+ {AH, "AH"},
+ {ESP, "ESP"},
+ {MAPPING_END, NULL}
+};
+
+/**
+ * String mappings for transform_type_t.
+ */
+mapping_t transform_type_m[] = {
+ {UNDEFINED_TRANSFORM_TYPE, "UNDEFINED_TRANSFORM_TYPE"},
+ {ENCRYPTION_ALGORITHM, "ENCRYPTION_ALGORITHM"},
+ {PSEUDO_RANDOM_FUNCTION, "PSEUDO_RANDOM_FUNCTION"},
+ {INTEGRITY_ALGORITHM, "INTEGRITY_ALGORITHM"},
+ {DIFFIE_HELLMAN_GROUP, "DIFFIE_HELLMAN_GROUP"},
+ {EXTENDED_SEQUENCE_NUMBERS, "EXTENDED_SEQUENCE_NUMBERS"},
+ {MAPPING_END, NULL}
+};
+
+/**
+ * String mappings for extended_sequence_numbers_t.
+ */
+mapping_t extended_sequence_numbers_m[] = {
+ {NO_EXT_SEQ_NUMBERS, "NO_EXT_SEQ_NUMBERS"},
+ {EXT_SEQ_NUMBERS, "EXT_SEQ_NUMBERS"},
+ {MAPPING_END, NULL}
+};
+
+
+typedef struct protocol_proposal_t protocol_proposal_t;
+
+/**
+ * substructure which holds all data algos for a specific protocol
+ */
+struct protocol_proposal_t {
+ /**
+ * protocol (ESP or AH)
+ */
+ protocol_id_t protocol;
+
+ /**
+ * priority ordered list of encryption algorithms
+ */
+ linked_list_t *encryption_algos;
+
+ /**
+ * priority ordered list of integrity algorithms
+ */
+ linked_list_t *integrity_algos;
+
+ /**
+ * priority ordered list of pseudo random functions
+ */
+ linked_list_t *prf_algos;
+
+ /**
+ * priority ordered list of dh groups
+ */
+ linked_list_t *dh_groups;
+
+ /**
+ * priority ordered list of extended sequence number flags
+ */
+ linked_list_t *esns;
+
+ /**
+ * senders SPI
+ */
+ chunk_t spi;
+};
+
+
+typedef struct private_child_proposal_t private_child_proposal_t;
+
+/**
+ * Private data of an child_proposal_t object
+ */
+struct private_child_proposal_t {
+
+ /**
+ * Public part
+ */
+ child_proposal_t public;
+
+ /**
+ * number of this proposal, as used in the payload
+ */
+ u_int8_t number;
+
+ /**
+ * list of protocol_proposal_t's
+ */
+ linked_list_t *protocol_proposals;
+};
+
+/**
+ * Look up a protocol_proposal, or create one if necessary...
+ */
+static protocol_proposal_t *get_protocol_proposal(private_child_proposal_t *this, protocol_id_t proto, bool create)
+{
+ protocol_proposal_t *proto_proposal = NULL, *current_proto_proposal;;
+ iterator_t *iterator;
+
+ /* find our protocol in the proposals */
+ iterator = this->protocol_proposals->create_iterator(this->protocol_proposals, TRUE);
+ while (iterator->has_next(iterator))
+ {
+ iterator->current(iterator, (void**)&current_proto_proposal);
+ if (current_proto_proposal->protocol == proto)
+ {
+ proto_proposal = current_proto_proposal;
+ break;
+ }
+ }
+ iterator->destroy(iterator);
+
+ if (!proto_proposal && create)
+ {
+ /* nope, create a new one */
+ proto_proposal = allocator_alloc_thing(protocol_proposal_t);
+ proto_proposal->protocol = proto;
+ proto_proposal->encryption_algos = linked_list_create();
+ proto_proposal->integrity_algos = linked_list_create();
+ proto_proposal->prf_algos = linked_list_create();
+ proto_proposal->dh_groups = linked_list_create();
+ proto_proposal->esns = linked_list_create();
+ if (proto == IKE)
+ {
+ proto_proposal->spi.len = 8;
+ }
+ else
+ {
+ proto_proposal->spi.len = 4;
+ }
+ proto_proposal->spi.ptr = allocator_alloc(proto_proposal->spi.len);
+ /* add to the list */
+ this->protocol_proposals->insert_last(this->protocol_proposals, (void*)proto_proposal);
+ }
+ return proto_proposal;
+}
+
+/**
+ * Add algorithm/keysize to a algorithm list
+ */
+static void add_algo(linked_list_t *list, u_int8_t algo, size_t key_size)
+{
+ algorithm_t *algo_key = allocator_alloc_thing(algorithm_t);
+
+ algo_key->algorithm = algo;
+ algo_key->key_size = key_size;
+ list->insert_last(list, (void*)algo_key);
+}
+
+/**
+ * Implements child_proposal_t.add_algorithm
+ */
+static void add_algorithm(private_child_proposal_t *this, protocol_id_t proto, transform_type_t type, u_int16_t algo, size_t key_size)
+{
+ protocol_proposal_t *proto_proposal = get_protocol_proposal(this, proto, TRUE);
+
+ switch (type)
+ {
+ case ENCRYPTION_ALGORITHM:
+ add_algo(proto_proposal->encryption_algos, algo, key_size);
+ break;
+ case INTEGRITY_ALGORITHM:
+ add_algo(proto_proposal->integrity_algos, algo, key_size);
+ break;
+ case PSEUDO_RANDOM_FUNCTION:
+ add_algo(proto_proposal->prf_algos, algo, key_size);
+ break;
+ case DIFFIE_HELLMAN_GROUP:
+ add_algo(proto_proposal->dh_groups, algo, 0);
+ break;
+ case EXTENDED_SEQUENCE_NUMBERS:
+ add_algo(proto_proposal->esns, algo, 0);
+ break;
+ default:
+ break;
+ }
+}
+
+/**
+ * Implements child_proposal_t.create_algorithm_iterator.
+ */
+static iterator_t *create_algorithm_iterator(private_child_proposal_t *this, protocol_id_t proto, transform_type_t type)
+{
+ protocol_proposal_t *proto_proposal = get_protocol_proposal(this, proto, FALSE);
+ if (proto_proposal == NULL)
+ {
+ return NULL;
+ }
+
+ switch (type)
+ {
+ case ENCRYPTION_ALGORITHM:
+ return proto_proposal->encryption_algos->create_iterator(proto_proposal->encryption_algos, TRUE);
+ case INTEGRITY_ALGORITHM:
+ return proto_proposal->integrity_algos->create_iterator(proto_proposal->integrity_algos, TRUE);
+ case PSEUDO_RANDOM_FUNCTION:
+ return proto_proposal->prf_algos->create_iterator(proto_proposal->prf_algos, TRUE);
+ case DIFFIE_HELLMAN_GROUP:
+ return proto_proposal->dh_groups->create_iterator(proto_proposal->dh_groups, TRUE);
+ case EXTENDED_SEQUENCE_NUMBERS:
+ return proto_proposal->esns->create_iterator(proto_proposal->esns, TRUE);
+ default:
+ break;
+ }
+ return NULL;
+
+}
+
+/**
+ * Find a matching alg/keysize in two linked lists
+ */
+static bool select_algo(linked_list_t *first, linked_list_t *second, u_int16_t *alg, size_t *key_size)
+{
+ iterator_t *first_iter, *second_iter;
+ algorithm_t *first_alg, *second_alg;
+
+ /* if in both are zero algorithms specified, we HAVE a match */
+ if (first->get_count(first) == 0 && second->get_count(second) == 0)
+ {
+ *alg = 0;
+ return TRUE;
+ }
+
+ first_iter = first->create_iterator(first, TRUE);
+ second_iter = second->create_iterator(second, TRUE);
+ /* compare algs, order of algs in "first" is preferred */
+ while (first_iter->has_next(first_iter))
+ {
+ first_iter->current(first_iter, (void**)&first_alg);
+ second_iter->reset(second_iter);
+ while (second_iter->has_next(second_iter))
+ {
+ second_iter->current(second_iter, (void**)&second_alg);
+ if (first_alg->algorithm == second_alg->algorithm &&
+ first_alg->key_size == second_alg->key_size)
+ {
+ /* ok, we have an algorithm */
+ *alg = first_alg->algorithm;
+ *key_size = first_alg->key_size;
+ first_iter->destroy(first_iter);
+ second_iter->destroy(second_iter);
+ return TRUE;
+ }
+ }
+ }
+ /* no match in all comparisons */
+ first_iter->destroy(first_iter);
+ second_iter->destroy(second_iter);
+ return FALSE;
+}
+
+/**
+ * Implements child_proposal_t.select.
+ */
+static child_proposal_t *select_proposal(private_child_proposal_t *this, private_child_proposal_t *other)
+{
+ child_proposal_t *selected;
+ u_int16_t algo;
+ size_t key_size;
+ iterator_t *iterator;
+ protocol_proposal_t *this_prop, *other_prop;
+ protocol_id_t proto;
+
+ /* empty proposal? no match */
+ if (this->protocol_proposals->get_count(this->protocol_proposals) == 0 ||
+ other->protocol_proposals->get_count(other->protocol_proposals) == 0)
+ {
+ return NULL;
+ }
+ /* they MUST have the same amount of protocols */
+ if (this->protocol_proposals->get_count(this->protocol_proposals) !=
+ other->protocol_proposals->get_count(other->protocol_proposals))
+ {
+ return NULL;
+ }
+
+ selected = child_proposal_create(this->number);
+
+ /* iterate over supplied proposals */
+ iterator = other->protocol_proposals->create_iterator(other->protocol_proposals, TRUE);
+ while (iterator->has_next(iterator))
+ {
+ iterator->current(iterator, (void**)&other_prop);
+ /* get the proposal with the same protocol */
+ proto = other_prop->protocol;
+ this_prop = get_protocol_proposal(this, proto, FALSE);
+
+ if (this_prop == NULL)
+ {
+ iterator->destroy(iterator);
+ selected->destroy(selected);
+ return NULL;
+ }
+
+ /* select encryption algorithm */
+ if (select_algo(this_prop->encryption_algos, other_prop->encryption_algos, &algo, &key_size))
+ {
+ if (algo)
+ {
+ selected->add_algorithm(selected, proto, ENCRYPTION_ALGORITHM, algo, key_size);
+ }
+ }
+ else
+ {
+ iterator->destroy(iterator);
+ selected->destroy(selected);
+ return NULL;
+ }
+ /* select integrity algorithm */
+ if (select_algo(this_prop->integrity_algos, other_prop->integrity_algos, &algo, &key_size))
+ {
+ if (algo)
+ {
+ selected->add_algorithm(selected, proto, INTEGRITY_ALGORITHM, algo, key_size);
+ }
+ }
+ else
+ {
+ iterator->destroy(iterator);
+ selected->destroy(selected);
+ return NULL;
+ }
+ /* select prf algorithm */
+ if (select_algo(this_prop->prf_algos, other_prop->prf_algos, &algo, &key_size))
+ {
+ if (algo)
+ {
+ selected->add_algorithm(selected, proto, PSEUDO_RANDOM_FUNCTION, algo, key_size);
+ }
+ }
+ else
+ {
+ iterator->destroy(iterator);
+ selected->destroy(selected);
+ return NULL;
+ }
+ /* select a DH-group */
+ if (select_algo(this_prop->dh_groups, other_prop->dh_groups, &algo, &key_size))
+ {
+ if (algo)
+ {
+ selected->add_algorithm(selected, proto, DIFFIE_HELLMAN_GROUP, algo, 0);
+ }
+ }
+ else
+ {
+ iterator->destroy(iterator);
+ selected->destroy(selected);
+ return NULL;
+ }
+ /* select if we use ESNs */
+ if (select_algo(this_prop->esns, other_prop->esns, &algo, &key_size))
+ {
+ if (algo)
+ {
+ selected->add_algorithm(selected, proto, EXTENDED_SEQUENCE_NUMBERS, algo, 0);
+ }
+ }
+ else
+ {
+ iterator->destroy(iterator);
+ selected->destroy(selected);
+ return NULL;
+ }
+ }
+ iterator->destroy(iterator);
+ /* everything matched, return new proposal */
+ return selected;
+}
+
+/**
+ * Implements child_proposal_t.get_number.
+ */
+static u_int8_t get_number(private_child_proposal_t *this)
+{
+ return this->number;
+}
+
+/**
+ * Implements child_proposal_t.get_protocols.
+ */
+static void get_protocols(private_child_proposal_t *this, protocol_id_t ids[2])
+{
+ iterator_t *iterator = this->protocol_proposals->create_iterator(this->protocol_proposals, TRUE);
+ u_int i = 0;
+
+ ids[0] = UNDEFINED_PROTOCOL_ID;
+ ids[1] = UNDEFINED_PROTOCOL_ID;
+ while (iterator->has_next(iterator))
+ {
+ protocol_proposal_t *proto_prop;
+ iterator->current(iterator, (void**)&proto_prop);
+ ids[i++] = proto_prop->protocol;
+ if (i>1)
+ {
+ /* should not happen, but who knows */
+ return;
+ }
+ }
+}
+
+/**
+ * Implements child_proposal_t.set_spi.
+ */
+static void set_spi(private_child_proposal_t *this, protocol_id_t proto, u_int64_t spi)
+{
+ protocol_proposal_t *proto_proposal = get_protocol_proposal(this, proto, FALSE);
+ if (proto_proposal)
+ {
+ if (proto == IKE)
+ {
+ *((u_int32_t*)proto_proposal->spi.ptr) = (u_int32_t)spi;
+ }
+ else
+ {
+ *((u_int64_t*)proto_proposal->spi.ptr) = spi;
+ }
+
+ }
+}
+
+/**
+ * Implements child_proposal_t.get_spi.
+ */
+static u_int64_t get_spi(private_child_proposal_t *this, protocol_id_t proto)
+{
+ protocol_proposal_t *proto_proposal = get_protocol_proposal(this, proto, FALSE);
+ if (proto_proposal)
+ {
+ if (proto == IKE)
+ {
+ return (u_int64_t)*((u_int32_t*)proto_proposal->spi.ptr);
+ }
+ else
+ {
+ return *((u_int64_t*)proto_proposal->spi.ptr);
+ }
+ }
+ return 0;
+}
+
+/**
+ * Frees all list items and destroys the list
+ */
+static void free_algo_list(linked_list_t *list)
+{
+ algorithm_t *algo;
+
+ while(list->get_count(list) > 0)
+ {
+ list->remove_last(list, (void**)&algo);
+ allocator_free(algo);
+ }
+ list->destroy(list);
+}
+
+/**
+ * Implements child_proposal_t.destroy.
+ */
+static void destroy(private_child_proposal_t *this)
+{
+ while(this->protocol_proposals->get_count(this->protocol_proposals) > 0)
+ {
+ protocol_proposal_t *proto_prop;
+ this->protocol_proposals->remove_last(this->protocol_proposals, (void**)&proto_prop);
+
+ free_algo_list(proto_prop->encryption_algos);
+ free_algo_list(proto_prop->integrity_algos);
+ free_algo_list(proto_prop->prf_algos);
+ free_algo_list(proto_prop->dh_groups);
+ free_algo_list(proto_prop->esns);
+
+ allocator_free(proto_prop->spi.ptr);
+ allocator_free(proto_prop);
+ }
+ this->protocol_proposals->destroy(this->protocol_proposals);
+
+ allocator_free(this);
+}
+
+/*
+ * Describtion in header-file
+ */
+child_proposal_t *child_proposal_create(u_int8_t number)
+{
+ private_child_proposal_t *this = allocator_alloc_thing(private_child_proposal_t);
+
+ this->public.add_algorithm = (void (*)(child_proposal_t*,protocol_id_t,transform_type_t,u_int16_t,size_t))add_algorithm;
+ this->public.create_algorithm_iterator = (iterator_t* (*)(child_proposal_t*,protocol_id_t,transform_type_t))create_algorithm_iterator;
+ this->public.select = (child_proposal_t* (*)(child_proposal_t*,child_proposal_t*))select_proposal;
+ this->public.get_number = (u_int8_t (*)(child_proposal_t*))get_number;
+ this->public.get_protocols = (void(*)(child_proposal_t *this, protocol_id_t ids[2]))get_protocols;
+ this->public.set_spi = (void(*)(child_proposal_t*,protocol_id_t,u_int64_t spi))set_spi;
+ this->public.get_spi = (u_int64_t(*)(child_proposal_t*,protocol_id_t))get_spi;
+ this->public.destroy = (void(*)(child_proposal_t*))destroy;
+
+ /* init private members*/
+ this->number = number;
+ this->protocol_proposals = linked_list_create();
+
+ return (&this->public);
+}
diff --git a/Source/charon/config/child_proposal.h b/Source/charon/config/child_proposal.h
new file mode 100644
index 000000000..d9e483e3b
--- /dev/null
+++ b/Source/charon/config/child_proposal.h
@@ -0,0 +1,239 @@
+/**
+ * @file child_proposal.h
+ *
+ * @brief Interface of child_proposal_t.
+ *
+ */
+
+/*
+ * Copyright (C) 2006 Martin Willi
+ * 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.
+ */
+
+#ifndef _CHILD_PROPOSAL_H_
+#define _CHILD_PROPOSAL_H_
+
+#include <types.h>
+#include <utils/identification.h>
+#include <utils/linked_list.h>
+#include <network/host.h>
+#include <transforms/crypters/crypter.h>
+#include <transforms/signers/signer.h>
+#include <transforms/diffie_hellman.h>
+#include <config/traffic_selector.h>
+
+
+typedef enum protocol_id_t protocol_id_t;
+
+/**
+ * Protocol ID of a proposal.
+ *
+ * @ingroup config
+ */
+enum protocol_id_t {
+ UNDEFINED_PROTOCOL_ID = 201,
+ IKE = 1,
+ AH = 2,
+ ESP = 3,
+};
+
+/**
+ * String mappings for protocol_id_t.
+ *
+ * @ingroup config
+ */
+extern mapping_t protocol_id_m[];
+
+
+typedef enum transform_type_t transform_type_t;
+
+/**
+ * Type of a transform, as in IKEv2 draft 3.3.2.
+ *
+ * @ingroup payloads
+ */
+enum transform_type_t {
+ UNDEFINED_TRANSFORM_TYPE = 241,
+ ENCRYPTION_ALGORITHM = 1,
+ PSEUDO_RANDOM_FUNCTION = 2,
+ INTEGRITY_ALGORITHM = 3,
+ DIFFIE_HELLMAN_GROUP = 4,
+ EXTENDED_SEQUENCE_NUMBERS = 5
+};
+
+/**
+ * String mappings for transform_type_t.
+ *
+ * @ingroup payloads
+ */
+extern mapping_t transform_type_m[];
+
+
+typedef enum extended_sequence_numbers_t extended_sequence_numbers_t;
+
+/**
+ * Extended sequence numbers, as in IKEv2 draft 3.3.2.
+ *
+ * @ingroup payloads
+ */
+enum extended_sequence_numbers_t {
+ NO_EXT_SEQ_NUMBERS = 0,
+ EXT_SEQ_NUMBERS = 1
+};
+
+/**
+ * String mappings for extended_sequence_numbers_t.
+ *
+ * @ingroup payloads
+ */
+extern mapping_t extended_sequence_numbers_m[];
+
+
+typedef struct algorithm_t algorithm_t;
+
+/**
+ * Struct used to store different kinds of algorithms. The internal
+ * lists of algorithms contain such structures.
+ */
+struct algorithm_t {
+ /**
+ * Value from an encryption_algorithm_t/integrity_algorithm_t/...
+ */
+ u_int16_t algorithm;
+
+ /**
+ * the associated key size, or zero if not needed
+ */
+ u_int16_t key_size;
+};
+
+typedef struct child_proposal_t child_proposal_t;
+
+/**
+ * @brief Stores a proposal for a child SA.
+ *
+ * A child_proposal may contain more than one algorithm
+ * of the same kind. ONE of them can be selected.
+ *
+ * @warning This class is NOT thread-save!
+ *
+ * @b Constructors:
+ * - child_proposal_create()
+ *
+ * @ingroup config
+ */
+struct child_proposal_t {
+
+ /**
+ * @brief Add an algorithm to the proposal.
+ *
+ * The algorithms are stored by priority, first added
+ * is the most preferred.
+ * Key size is only needed for encryption algorithms
+ * with variable key size (such as AES), or integrity
+ * algorithms.
+ * The alg parameter accepts encryption_algorithm_t,
+ * integrity_algorithm_t, dh_group_number_t and
+ * extended_sequence_numbers_t.
+ *
+ * @warning Do not add while other threads are reading.
+ *
+ * @param this calling object
+ * @param proto desired protocol
+ * @param type kind of algorithm
+ * @param alg identifier for algorithm
+ * @param key_size key size to use
+ */
+ void (*add_algorithm) (child_proposal_t *this, protocol_id_t proto, transform_type_t type, u_int16_t alg, size_t key_size);
+
+ /**
+ * @brief Get an iterator over algorithms for a specifc protocol/algo type.
+ *
+ * @param this calling object
+ * @param proto desired protocol
+ * @param type kind of algorithm
+ * @return iterator over algorithms
+ */
+ iterator_t *(*create_algorithm_iterator) (child_proposal_t *this, protocol_id_t proto, transform_type_t type);
+
+ /**
+ * @brief Compare two proposal, and select a matching subset.
+ *
+ * If the proposals are for the same protocols (AH/ESP), they are
+ * compared. If they have at least one algorithm of each type
+ * in common, a resulting proposal of this kind is created.
+ *
+ * @param this calling object
+ * @param other proposal to compair agains
+ * @return
+ * - selected proposal, if possible
+ * - NULL, if proposals don't match
+ */
+ child_proposal_t *(*select) (child_proposal_t *this, child_proposal_t *other);
+
+ /**
+ * @brief Get the number set on construction.
+ *
+ * @param this calling object
+ * @return number
+ */
+ u_int8_t (*get_number) (child_proposal_t *this);
+
+ /**
+ * @brief Get the protocol ids in the proposals.
+ *
+ * With AH and ESP, there could be two protocols in one
+ * proposal.
+ *
+ * @param this calling object
+ * @param ids array of protocol ids,
+ */
+ void (*get_protocols) (child_proposal_t *this, protocol_id_t ids[2]);
+
+ /**
+ * @brief Get the spi for a specific protocol.
+ *
+ * @param this calling object
+ * @param proto AH/ESP
+ * @return spi for proto
+ */
+ u_int64_t (*get_spi) (child_proposal_t *this, protocol_id_t proto);
+
+ /**
+ * @brief Set the spi for a specific protocol.
+ *
+ * @param this calling object
+ * @param proto AH/ESP
+ * @param spi spi to set for proto
+ */
+ void (*set_spi) (child_proposal_t *this, protocol_id_t proto, u_int64_t spi);
+
+ /**
+ * @brief Destroys the proposal object.
+ *
+ * @param this calling object
+ */
+ void (*destroy) (child_proposal_t *this);
+};
+
+/**
+ * @brief Create a child proposal for AH and/or ESP.
+ *
+ * @param number number of the proposal, as in the payload
+ * @return child_proposal_t object
+ *
+ * @ingroup config
+ */
+child_proposal_t *child_proposal_create(u_int8_t number);
+
+#endif //_CHILD_PROPOSAL_H_
diff --git a/Source/charon/config/child_proposal.o b/Source/charon/config/child_proposal.o
new file mode 100644
index 000000000..839923297
--- /dev/null
+++ b/Source/charon/config/child_proposal.o
Binary files differ
diff --git a/Source/charon/config/configuration_manager.c b/Source/charon/config/configuration_manager.c
index f4873fa3c..fa27ba341 100644
--- a/Source/charon/config/configuration_manager.c
+++ b/Source/charon/config/configuration_manager.c
@@ -274,126 +274,59 @@ u_int8_t private_key_2[];
*/
static void load_default_config (private_configuration_manager_t *this)
{
- init_config_t *init_config1, *init_config2, *init_config3, *init_config4, *init_config5;
- ike_proposal_t proposals[4];
+ init_config_t *init_config;
+ ike_proposal_t proposals;
child_proposal_t *child_proposal;
- sa_config_t *sa_config1, *sa_config2, *sa_config3, *sa_config4, *sa_config5;
+ sa_config_t *sa_config;
traffic_selector_t *ts;
- init_config1 = init_config_create("0.0.0.0","192.168.1.1",IKEV2_UDP_PORT,IKEV2_UDP_PORT);
- init_config2 = init_config_create("0.0.0.0","192.168.1.2",IKEV2_UDP_PORT,IKEV2_UDP_PORT);
- init_config3 = init_config_create("0.0.0.0","127.0.0.1",IKEV2_UDP_PORT,IKEV2_UDP_PORT);
- init_config4 = init_config_create("0.0.0.0","127.0.0.1",IKEV2_UDP_PORT,IKEV2_UDP_PORT);
- init_config5 = init_config_create("0.0.0.0","192.168.1.2",IKEV2_UDP_PORT,IKEV2_UDP_PORT);
+ init_config = init_config_create("0.0.0.0","127.0.0.1",IKEV2_UDP_PORT,IKEV2_UDP_PORT);
+
ts = traffic_selector_create_from_string(1, TS_IPV4_ADDR_RANGE, "0.0.0.0", 0, "255.255.255.255", 65535);
+ proposals.encryption_algorithm = ENCR_AES_CBC;
+ proposals.encryption_algorithm_key_length = 16;
+ proposals.integrity_algorithm = AUTH_HMAC_MD5_96;
+ proposals.integrity_algorithm_key_length = 16;
+ proposals.pseudo_random_function = PRF_HMAC_MD5;
+ proposals.pseudo_random_function_key_length = 16;
+ proposals.diffie_hellman_group = MODP_1024_BIT;
- proposals[0].encryption_algorithm = ENCR_AES_CBC;
- proposals[0].encryption_algorithm_key_length = 16;
- proposals[0].integrity_algorithm = AUTH_HMAC_MD5_96;
- proposals[0].integrity_algorithm_key_length = 16;
- proposals[0].pseudo_random_function = PRF_HMAC_MD5;
- proposals[0].pseudo_random_function_key_length = 16;
- proposals[0].diffie_hellman_group = MODP_1024_BIT;
-
- proposals[1] = proposals[0];
- proposals[1].integrity_algorithm = AUTH_HMAC_SHA1_96;
- proposals[1].integrity_algorithm_key_length = 20;
- proposals[1].pseudo_random_function = PRF_HMAC_SHA1;
- proposals[1].pseudo_random_function_key_length = 20;
- proposals[1].diffie_hellman_group = MODP_2048_BIT;
-
-
- proposals[2] = proposals[1];
- proposals[2].diffie_hellman_group = MODP_4096_BIT;
- proposals[3] = proposals[1];
- proposals[3].diffie_hellman_group = MODP_2048_BIT;
-
- init_config1->add_proposal(init_config1,1,proposals[1]);
- init_config1->add_proposal(init_config1,1,proposals[0]);
- init_config2->add_proposal(init_config2,1,proposals[1]);
- init_config2->add_proposal(init_config2,1,proposals[0]);
- init_config3->add_proposal(init_config3,1,proposals[1]);
- init_config3->add_proposal(init_config3,1,proposals[0]);
- init_config4->add_proposal(init_config4,1,proposals[3]);
- init_config4->add_proposal(init_config4,1,proposals[2]);
- init_config5->add_proposal(init_config5,1,proposals[3]);
- init_config5->add_proposal(init_config5,1,proposals[2]);
-
- sa_config1 = sa_config_create(ID_IPV4_ADDR, "192.168.1.2",
- ID_IPV4_ADDR, "192.168.1.1",
- SHARED_KEY_MESSAGE_INTEGRITY_CODE,
- 30000);
-
- sa_config1->add_traffic_selector_initiator(sa_config1,ts);
- sa_config1->add_traffic_selector_responder(sa_config1,ts);
-
- sa_config2 = sa_config_create(ID_IPV4_ADDR, "192.168.1.1",
- ID_IPV4_ADDR, "192.168.1.2",
- SHARED_KEY_MESSAGE_INTEGRITY_CODE,
- 30000);
-
- sa_config2->add_traffic_selector_initiator(sa_config2,ts);
- sa_config2->add_traffic_selector_responder(sa_config2,ts);
+ init_config->add_proposal(init_config,1,proposals);
- sa_config3 = sa_config_create(ID_IPV4_ADDR, "192.168.1.1",
- ID_IPV4_ADDR, "192.168.1.2",
- SHARED_KEY_MESSAGE_INTEGRITY_CODE,
- 30000);
+ sa_config = sa_config_create(ID_IPV4_ADDR, "127.0.0.1",
+ ID_IPV4_ADDR, "127.0.0.1",
+ RSA_DIGITAL_SIGNATURE,
+ 30000);
- sa_config3->add_traffic_selector_initiator(sa_config3,ts);
- sa_config3->add_traffic_selector_responder(sa_config3,ts);
-
- sa_config4 = sa_config_create(ID_IPV4_ADDR, "127.0.0.1",
- ID_IPV4_ADDR, "127.0.0.1",
- RSA_DIGITAL_SIGNATURE,
- 30000);
-
- sa_config4->add_traffic_selector_initiator(sa_config4,ts);
- sa_config4->add_traffic_selector_responder(sa_config4,ts);
-
- sa_config5 = sa_config_create(ID_IPV4_ADDR, "192.168.1.1",
- ID_IPV4_ADDR, "192.168.1.2",
- RSA_DIGITAL_SIGNATURE,
- 30000);
-
- sa_config5->add_traffic_selector_initiator(sa_config5,ts);
- sa_config5->add_traffic_selector_responder(sa_config5,ts);
+ sa_config->add_traffic_selector_initiator(sa_config,ts);
+ sa_config->add_traffic_selector_responder(sa_config,ts);
ts->destroy(ts);
/* ah and esp prop */
- child_proposal->add_algorithm(child_proposal, AH, INTEGRITY_ALGORITHM, AUTH_HMAC_SHA1_96, 20);
- child_proposal->add_algorithm(child_proposal, AH, DIFFIE_HELLMAN_GROUP, MODP_1024_BIT, 0);
- child_proposal->add_algorithm(child_proposal, AH, EXTENDED_SEQUENCE_NUMBERS, NO_EXT_SEQ_NUMBERS, 0);
+ child_proposal = child_proposal_create(1);
+
+ //child_proposal->add_algorithm(child_proposal, AH, INTEGRITY_ALGORITHM, AUTH_HMAC_SHA1_96, 20);
+ //child_proposal->add_algorithm(child_proposal, AH, DIFFIE_HELLMAN_GROUP, MODP_1024_BIT, 0);
+ //child_proposal->add_algorithm(child_proposal, AH, EXTENDED_SEQUENCE_NUMBERS, NO_EXT_SEQ_NUMBERS, 0);
child_proposal->add_algorithm(child_proposal, ESP, ENCRYPTION_ALGORITHM, ENCR_AES_CBC, 16);
child_proposal->add_algorithm(child_proposal, ESP, INTEGRITY_ALGORITHM, AUTH_HMAC_SHA1_96, 20);
- child_proposal->add_algorithm(child_proposal, ESP, DIFFIE_HELLMAN_GROUP, MODP_UNDEFINED, 0);
+ child_proposal->add_algorithm(child_proposal, ESP, DIFFIE_HELLMAN_GROUP, MODP_1024_BIT, 0);
child_proposal->add_algorithm(child_proposal, ESP, EXTENDED_SEQUENCE_NUMBERS, NO_EXT_SEQ_NUMBERS, 0);
- sa_config1->add_proposal(sa_config1, child_proposal);
- sa_config2->add_proposal(sa_config2, child_proposal);
- sa_config3->add_proposal(sa_config3, child_proposal);
- sa_config5->add_proposal(sa_config5, child_proposal);
+ sa_config->add_proposal(sa_config, child_proposal);
- this->add_new_configuration(this,"jan",init_config1,sa_config1);
- this->add_new_configuration(this,"martin",init_config2,sa_config2);
- this->add_new_configuration(this,"localhost-shared",init_config3,sa_config3);
- this->add_new_configuration(this,"localhost-rsa",init_config3,sa_config4);
- this->add_new_configuration(this,"localhost-bad_dh_group",init_config4, sa_config3);
- this->add_new_configuration(this,"martin-bad_dh_group",init_config5, sa_config3);
- this->add_new_configuration(this,"martin-rsa",init_config2, sa_config5);
+ this->add_new_configuration(this,"localhost",init_config,sa_config);
- this->add_new_preshared_secret(this,ID_IPV4_ADDR, "192.168.1.2","verschluesselt");
- this->add_new_preshared_secret(this,ID_IPV4_ADDR, "192.168.1.1","verschluesselt");
- this->add_new_preshared_secret(this,ID_IPV4_ADDR, "127.0.0.1","verschluesselt");
+ //this->add_new_preshared_secret(this,ID_IPV4_ADDR, "192.168.1.2","verschluesselt");
this->add_new_rsa_public_key(this,ID_IPV4_ADDR, "127.0.0.1", public_key_1, 256);
- this->add_new_rsa_public_key(this,ID_IPV4_ADDR, "192.168.1.1", public_key_2, 256);
+ //this->add_new_rsa_public_key(this,ID_IPV4_ADDR, "192.168.1.1", public_key_2, 256);
this->add_new_rsa_private_key(this,ID_IPV4_ADDR, "127.0.0.1", private_key_1, 1024);
- this->add_new_rsa_private_key(this,ID_IPV4_ADDR, "192.168.1.1", private_key_2, 1024);
+ //this->add_new_rsa_private_key(this,ID_IPV4_ADDR, "192.168.1.1", private_key_2, 1024);
}
/**
diff --git a/Source/charon/config/sa_config.c b/Source/charon/config/sa_config.c
index 1a21d0fd4..f098d176f 100644
--- a/Source/charon/config/sa_config.c
+++ b/Source/charon/config/sa_config.c
@@ -208,9 +208,9 @@ static size_t select_traffic_selectors(private_sa_config_t *this, linked_list_t
/**
* Implementation of sa_config_t.get_proposal_iterator
*/
-static iterator_t *create_proposal_iterator(private_sa_config_t *this)
+static linked_list_t *get_proposals(private_sa_config_t *this)
{
- return this->proposals->create_iterator(this->proposals, TRUE);
+ return this->proposals;
}
/**
@@ -334,7 +334,7 @@ sa_config_t *sa_config_create(id_type_t my_id_type, char *my_id, id_type_t other
this->public.select_traffic_selectors_initiator = (size_t(*)(sa_config_t*,traffic_selector_t*[],size_t,traffic_selector_t**[]))select_traffic_selectors_initiator;
this->public.get_traffic_selectors_responder = (size_t(*)(sa_config_t*,traffic_selector_t**[]))get_traffic_selectors_responder;
this->public.select_traffic_selectors_responder = (size_t(*)(sa_config_t*,traffic_selector_t*[],size_t,traffic_selector_t**[]))select_traffic_selectors_responder;
- this->public.create_proposal_iterator = (iterator_t*(*)(sa_config_t*))create_proposal_iterator;
+ this->public.get_proposals = (linked_list_t*(*)(sa_config_t*))get_proposals;
this->public.select_proposal = (child_proposal_t*(*)(sa_config_t*,linked_list_t*))select_proposal;
this->public.add_traffic_selector_initiator = (void(*)(sa_config_t*,traffic_selector_t*))add_traffic_selector_initiator;
this->public.add_traffic_selector_responder = (void(*)(sa_config_t*,traffic_selector_t*))add_traffic_selector_responder;
diff --git a/Source/charon/config/sa_config.h b/Source/charon/config/sa_config.h
index 0bfde778b..fd1952864 100644
--- a/Source/charon/config/sa_config.h
+++ b/Source/charon/config/sa_config.h
@@ -154,15 +154,18 @@ struct sa_config_t {
size_t (*select_traffic_selectors_responder) (sa_config_t *this, traffic_selector_t *supplied[], size_t count, traffic_selector_t **selected[]);
/**
- * @brief Get an iterator for the internally stored proposals.
+ * @brief Get the list of internally stored proposals.
*
- * @warning Items are still owned by sa_config and MUST NOT
+ * Rembember: sa_config_t does store proposals for AH/ESP,
+ * IKE proposals are in the init_config_t
+ *
+ * @warning List and Items are still owned by sa_config and MUST NOT
* be manipulated or freed!
*
* @param this calling object
- * @return iterator for the proposals
+ * @return lists with proposals
*/
- iterator_t *(*create_proposal_iterator) (sa_config_t *this);
+ linked_list_t *(*get_proposals) (sa_config_t *this);
/**
* @brief Select a proposal from a supplied list.
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-19 00:30:58 +0000