aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/charon/configuration_manager.c484
-rw-r--r--Source/charon/configuration_manager.h193
-rw-r--r--Source/charon/daemon.c2
-rw-r--r--Source/charon/encoding/message.c2
-rw-r--r--Source/charon/encoding/message.h2
-rw-r--r--Source/charon/globals.h4
-rw-r--r--Source/charon/queues/jobs/delete_ike_sa_job.h2
-rw-r--r--Source/charon/sa/ike_sa.c (renamed from Source/charon/ike_sa.c)4
-rw-r--r--Source/charon/sa/ike_sa.h (renamed from Source/charon/ike_sa.h)4
-rw-r--r--Source/charon/sa/ike_sa_id.c (renamed from Source/charon/ike_sa_id.c)0
-rw-r--r--Source/charon/sa/ike_sa_id.h (renamed from Source/charon/ike_sa_id.h)0
-rw-r--r--Source/charon/sa/ike_sa_manager.c (renamed from Source/charon/ike_sa_manager.c)2
-rw-r--r--Source/charon/sa/ike_sa_manager.h (renamed from Source/charon/ike_sa_manager.h)2
-rw-r--r--Source/charon/testcases/ike_sa_id_test.c2
-rw-r--r--Source/charon/testcases/ike_sa_manager_test.c2
-rw-r--r--Source/charon/testcases/ike_sa_test.c2
16 files changed, 15 insertions, 692 deletions
diff --git a/Source/charon/configuration_manager.c b/Source/charon/configuration_manager.c
deleted file mode 100644
index 3b1488cf6..000000000
--- a/Source/charon/configuration_manager.c
+++ /dev/null
@@ -1,484 +0,0 @@
-/**
- * @file configuration.c
- *
- * @brief Configuration class used to store IKE_SA-configurations.
- *
- * Object of this type represents the configuration for all IKE_SA's and their child_sa's.
- *
- */
-
-/*
- * Copyright (C) 2005 Jan Hutter, 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 <stdlib.h>
-
-#include "configuration_manager.h"
-
-#include <types.h>
-#include <globals.h>
-#include <utils/allocator.h>
-#include <encoding/payloads/nonce_payload.h>
-#include <encoding/payloads/proposal_substructure.h>
-#include <encoding/payloads/ke_payload.h>
-#include <encoding/payloads/transform_attribute.h>
-
-/**
- * Private data of an configuration_t object
- */
-typedef struct private_configuration_manager_s private_configuration_manager_t;
-
-struct private_configuration_manager_s {
-
- /**
- * Public part
- */
- configuration_manager_t public;
-
- /**
- * Assigned logger object
- */
- logger_t *logger;
-};
-
-/**
- * Implements function configuration_manager_t.get_remote_host.
- */
-static status_t get_remote_host(private_configuration_manager_t *this, char *name, host_t **host)
-{
- /*
- * For testing purposes, hard coded host informations for two configurations are returned.
- *
- * Further improvements could store them in a linked list or hash table.
- */
-
- host_t *remote;
- status_t status = SUCCESS;
-
- if (strcmp(name, "pinflb30") == 0)
- {
- remote = host_create(AF_INET, "152.96.193.130", 500);
- }
- else if (strcmp(name, "pinflb31") == 0)
- {
- remote = host_create(AF_INET, "152.96.193.131", 500);
- }
- else
- {
- status = NOT_FOUND;
- }
- if ((status != NOT_FOUND) && (remote == NULL))
- {
- return OUT_OF_RES;
- }
-
- *host = remote;
- return status;
-}
-
-/**
- * Implements function configuration_manager_t.get_local_host.
- */
-static status_t get_local_host(private_configuration_manager_t *this, char *name, host_t **host)
-{
- /*
- * For testing purposes, only the default route is returned for each configuration.
- *
- * Further improvements could store different local host informations in a linked list or hash table.
- */
- host_t *local;
- local = host_create(AF_INET, "0.0.0.0", 0);
- if (local == NULL)
- {
- return OUT_OF_RES;
- }
- *host = local;
- return SUCCESS;
-}
-
-/**
- * Implements function configuration_manager_t.get_dh_group_number.
- */
-static status_t get_dh_group_number(private_configuration_manager_t *this,char *name, u_int16_t *dh_group_number, u_int16_t priority)
-{
- /* Currently only two dh_group_numbers are supported for each configuration*/
-
- if (priority == 1)
- {
- *dh_group_number = MODP_1024_BIT;
- }
- else
- {
- *dh_group_number = MODP_768_BIT;
- }
- return SUCCESS;
-}
-
-/**
- * Implements function configuration_manager_t.get_proposals_for_host.
- */
-static status_t get_proposals_for_host(private_configuration_manager_t *this, host_t *host, linked_list_iterator_t *iterator)
-{
- /*
- * Currently the following hard coded proposal is created and returned for all hosts:
- * - ENCR_AES_CBC 128Bit
- * - PRF_HMAC_MD5 128Bit
- * - AUTH_HMAC_MD5_96 128Bit
- * - MODP_1024_BIT
- */
- proposal_substructure_t *proposal;
- transform_substructure_t *transform;
- transform_attribute_t *attribute;
- status_t status;
-
- proposal = proposal_substructure_create();
- if (proposal == NULL)
- {
- return OUT_OF_RES;
- }
-
- proposal->set_proposal_number(proposal, 1);
- proposal->set_protocol_id(proposal, 1);
-
- /*
- * Encryption Algorithm
- */
- transform = transform_substructure_create();
- if (transform == NULL)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- status = proposal->add_transform_substructure(proposal, transform);
- if (status != SUCCESS)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- transform->set_transform_type(transform, ENCRYPTION_ALGORITHM);
- transform->set_transform_id(transform, ENCR_AES_CBC);
-
- attribute = transform_attribute_create();
- if (attribute == NULL)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- status = transform->add_transform_attribute(transform, attribute);
- if (status != SUCCESS)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- attribute->set_attribute_type(attribute, KEY_LENGTH);
- attribute->set_value(attribute, 16);
-
- /*
- * Pseudo-random Function
- */
- transform = transform_substructure_create();
- if (transform == NULL)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- status = proposal->add_transform_substructure(proposal, transform);
- if (status != SUCCESS)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- transform->set_transform_type(transform, PSEUDO_RANDOM_FUNCTION);
- transform->set_transform_id(transform, PRF_HMAC_MD5);
-
- attribute = transform_attribute_create();
- if (attribute == NULL)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- status = transform->add_transform_attribute(transform, attribute);
- if (status != SUCCESS)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- attribute->set_attribute_type(attribute, KEY_LENGTH);
- attribute->set_value(attribute, 16);
-
-
- /*
- * Integrity Algorithm
- */
- transform = transform_substructure_create();
- if (transform == NULL)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- status = proposal->add_transform_substructure(proposal, transform);
- if (status != SUCCESS)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- transform->set_transform_type(transform, INTEGRITIY_ALGORITHM);
- transform->set_transform_id(transform, AUTH_HMAC_MD5_96);
-
- attribute = transform_attribute_create();
- if (attribute == NULL)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- status = transform->add_transform_attribute(transform, attribute);
- if (status != SUCCESS)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- attribute->set_attribute_type(attribute, KEY_LENGTH);
- attribute->set_value(attribute, 16);
-
-
- /*
- * Diffie-Hellman Group
- */
- transform = transform_substructure_create();
- if (transform == NULL)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- status = proposal->add_transform_substructure(proposal, transform);
- if (status != SUCCESS)
- {
- proposal->destroy(proposal);
- return OUT_OF_RES;
- }
- transform->set_transform_type(transform, DIFFIE_HELLMAN_GROUP);
- transform->set_transform_id(transform, MODP_1024_BIT);
-
- iterator->insert_after(iterator, (void*)proposal);
-
- return SUCCESS;
-}
-
-/**
- * Implements function configuration_manager_t.select_proposals_for_host.
- */
-static status_t select_proposals_for_host(private_configuration_manager_t *this, host_t *host, linked_list_iterator_t *in, linked_list_iterator_t *out)
-{
- /* Currently the first suggested proposal is selected, cloned and then returned*/
- status_t status;
- proposal_substructure_t *first_suggested_proposal;
- proposal_substructure_t *selected_proposal;
-
- this->logger->log(this->logger,CONTROL | MORE, "Going to select first suggested proposal");
- if (!in->has_next(in))
- {
- this->logger->log(this->logger,ERROR | MORE, "No proposal suggested");
- /* no suggested proposal! */
- return FAILED;
- }
-
- status = in->current(in,(void **) &first_suggested_proposal);
- if (status != SUCCESS)
- {
- this->logger->log(this->logger,ERROR, "Fatal error: could not get first proposal from iterator");
- return status;
- }
- status = first_suggested_proposal->clone(first_suggested_proposal,&selected_proposal);
- if (status != SUCCESS)
- {
- this->logger->log(this->logger,ERROR, "Fatal error: could not clone proposal");
- /* could not clone proposal */
- return status;
- }
-
- status = out->insert_after(out,selected_proposal);
- if (status != SUCCESS)
- {
- this->logger->log(this->logger,ERROR, "Fatal error: could not insert selected proposal in out iterator");
- }
- return status;
-}
-
-/**
- * Implements function configuration_manager_t.get_transforms_for_host_and_proposals.
- */
-static status_t get_transforms_for_host_and_proposals (private_configuration_manager_t *this, host_t *host, linked_list_iterator_t *proposals,encryption_algorithm_t *encryption_algorithm,pseudo_random_function_t *pseudo_random_function, integrity_algorithm_t *integrity_algorithm)
-{
- /*
- * Currently the given proposals are not checked if they are valid for specific host!
- *
- * The first proposal is taken and the appropriate transform objects are created (only if they are supported)
- */
-
- encryption_algorithm_t selected_encryption_algorithm = ENCR_UNDEFINED;
- pseudo_random_function_t selected_pseudo_random_function = PRF_UNDEFINED;
- integrity_algorithm_t selected_integrity_algorithm = AUTH_UNDEFINED;
- proposal_substructure_t *proposal;
- linked_list_iterator_t *transforms;
- status_t status;
-
- this->logger->log(this->logger,ERROR, "Going to get transforms for given proposal");
-
- if (!proposals->has_next(proposals))
- {
- this->logger->log(this->logger,ERROR | MORE, "No proposal available");
- return FAILED;
- }
-
- status = proposals->current(proposals,(void **) &(proposal));
- if (status != SUCCESS)
- {
- this->logger->log(this->logger,ERROR, "Fatal error: could not get first proposal from iterator");
- return status;
- }
-
- status = proposal->create_transform_substructure_iterator(proposal,&transforms,TRUE);
- if (status != SUCCESS)
- {
- this->logger->log(this->logger,ERROR, "Fatal error: could not create iterator of transforms");
- return status;
- }
-
- while (transforms->has_next(transforms))
- {
- transform_substructure_t *current_transform;
- transform_type_t transform_type;
- u_int16_t transform_id;
-
- status = transforms->current(transforms,(void **) &(current_transform));
- if (status != SUCCESS)
- {
- this->logger->log(this->logger,ERROR, "Fatal error: could not get current transform substructure object");
- transforms->destroy(transforms);
- return status;
- }
-
- transform_type = current_transform->get_transform_type(current_transform);
- transform_id = current_transform->get_transform_id(current_transform);
-
- this->logger->log(this->logger,CONTROL | MOST, "Going to process transform of type %s",mapping_find(transform_type_m,transform_type));
- switch (transform_type)
- {
- case ENCRYPTION_ALGORITHM:
- {
- this->logger->log(this->logger,CONTROL | MORE, "Encryption algorithm: %s",mapping_find(encryption_algorithm_m,transform_id));
- selected_encryption_algorithm = transform_id;
- break;
- }
- case PSEUDO_RANDOM_FUNCTION:
- {
- this->logger->log(this->logger,CONTROL | MORE, "Create transform object for PRF of type %s",mapping_find(pseudo_random_function_m,transform_id));
- selected_pseudo_random_function = transform_id;
- break;
- }
- case INTEGRITIY_ALGORITHM:
- {
- this->logger->log(this->logger,CONTROL | MORE, "Integrity algorithm: %s",mapping_find(integrity_algorithm_m,transform_id));
- selected_integrity_algorithm = transform_id;
- break;
- }
- case DIFFIE_HELLMAN_GROUP:
- {
- this->logger->log(this->logger,CONTROL | MORE, "DH Group: %s",mapping_find(diffie_hellman_group_m,transform_id));
- break;
- }
- default:
- {
- this->logger->log(this->logger,ERROR | MORE, "Transform type not supported!");
- transforms->destroy(transforms);
- return FAILED;
- }
- }
- }
-
- transforms->destroy(transforms);
-
- *encryption_algorithm = selected_encryption_algorithm;
- *pseudo_random_function = selected_pseudo_random_function;
- *integrity_algorithm = selected_integrity_algorithm;
- return SUCCESS;
-}
-
-/**
- * Implements function configuration_manager_t.is_dh_group_allowed_for_host.
- */
-static status_t is_dh_group_allowed_for_host(private_configuration_manager_t *this, host_t *host, diffie_hellman_group_t group, bool *allowed)
-{
- /*
- * Only the two DH groups 768 and 1024 are supported for each configuration
- */
-
- if (group == MODP_768_BIT || group == MODP_1024_BIT)
- {
- *allowed = TRUE;
- }
- *allowed = FALSE;
-
- this->logger->log(this->logger,CONTROL | MORE, "DH group %s is %s",mapping_find(diffie_hellman_group_m, group),(allowed)? "allowed" : "not allowed");
- return SUCCESS;
-}
-
-
-/**
- * Implements function destroy of configuration_t.
- * See #configuration_s.destroy for description.
- */
-static status_t destroy(private_configuration_manager_t *this)
-{
- this->logger->log(this->logger,CONTROL | MORE, "Going to destroy configuration manager ");
-
- this->logger->log(this->logger,CONTROL | MOST, "Destroy assigned logger");
- global_logger_manager->destroy_logger(global_logger_manager,this->logger);
- allocator_free(this);
- return SUCCESS;
-}
-
-/*
- * Described in header-file
- */
-configuration_manager_t *configuration_manager_create()
-{
- private_configuration_manager_t *this = allocator_alloc_thing(private_configuration_manager_t);
-
- if (this == NULL)
- {
- return NULL;
- }
-
- /* public functions */
- this->public.destroy = (status_t(*)(configuration_manager_t*))destroy;
- this->public.get_remote_host = (status_t(*)(configuration_manager_t*,char*,host_t**))get_remote_host;
- this->public.get_local_host = (status_t(*)(configuration_manager_t*,char*,host_t**))get_local_host;
- this->public.get_dh_group_number = (status_t(*)(configuration_manager_t*,char*,u_int16_t *, u_int16_t))get_dh_group_number;
- this->public.get_proposals_for_host = (status_t(*)(configuration_manager_t*,host_t*,linked_list_iterator_t*))get_proposals_for_host;
- this->public.select_proposals_for_host = (status_t(*)(configuration_manager_t*,host_t*,linked_list_iterator_t*,linked_list_iterator_t*))select_proposals_for_host;
- this->public.get_transforms_for_host_and_proposals = (status_t (*) (configuration_manager_t *, host_t *, linked_list_iterator_t *,encryption_algorithm_t *,pseudo_random_function_t *, integrity_algorithm_t *)) get_transforms_for_host_and_proposals;
- this->public.is_dh_group_allowed_for_host = (status_t(*)(configuration_manager_t*,host_t*,diffie_hellman_group_t,bool*)) is_dh_group_allowed_for_host;
-
- /* private variables */
- this->logger = global_logger_manager->create_logger(global_logger_manager,CONFIGURATION_MANAGER,NULL);
-
- if (this->logger == NULL)
- {
- allocator_free(this);
- return NULL;
- }
-
- return (&this->public);
-}
diff --git a/Source/charon/configuration_manager.h b/Source/charon/configuration_manager.h
deleted file mode 100644
index b192c0cf7..000000000
--- a/Source/charon/configuration_manager.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * @file configuration_manager.h
- *
- * @brief Manages all configuration aspects of the daemon.
- *
- */
-
-/*
- * Copyright (C) 2005 Jan Hutter, 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 CONFIGURATION_MANAGER_H_
-#define CONFIGURATION_MANAGER_H_
-
-#include <types.h>
-#include <utils/linked_list.h>
-#include <utils/host.h>
-#include <encoding/payloads/transform_substructure.h>
-#include <transforms/prfs/prf.h>
-#include <transforms/signers/signer.h>
-#include <transforms/crypters/crypter.h>
-
-/**
- * @brief Manages all configuration aspects of the daemon.
- *
- * Currently the configuration manager class does not store specific configurations.
- * It is expected, that in future different configurations are stored in a linked list
- * or a hash map and are managed by this class.
- *
- */
-typedef struct configuration_manager_s configuration_manager_t;
-
-struct configuration_manager_s {
-
- /**
- * Gets the remote host information for a specific configuration name.
- *
- * A host information consist of IP address and UDP port.
- *
- * @param this calling object
- * @param name name of the configuration
- * @param host remote host information gets stored at this location
- *
- * @return
- * - OUT_OF_RES
- * - NOT_FOUND
- * - SUCCESS
- */
- status_t (*get_remote_host) (configuration_manager_t *this, char *name, host_t **host);
-
- /**
- * Gets the local host information for a specific configuration name
- *
- * A host information consist of IP address and UDP port.
- *
- * @param this calling object
- * @param name name of the configuration
- * @param host local host information gets stored at this location
- *
- * @return
- * - OUT_OF_RES
- * - NOT_FOUND (not yet implemented)
- * - SUCCESS
- */
- status_t (*get_local_host) (configuration_manager_t *this, char *name, host_t **host);
-
- /**
- * Returns the DH group number to use when initiating a connection.
- *
- * To make sure that different group numbers are supported in case
- * a group number is not supported by other peer, a priority has to get defined.
- *
- *
- * @param this calling object
- * @param name name of the configuration
- * @param dh_group_number the DH group number gets stored at this location
- * @param priority priority to use for selection of DH group number.
- * Highest priority is 1. All higher values have lower
- * priority.
- *
- * @return
- * - FAILED (not yet implemented)
- * - NOT_FOUND (not yet implemented)
- * - SUCCESS
- */
- status_t (*get_dh_group_number) (configuration_manager_t *this, char *name, u_int16_t *dh_group_number, u_int16_t priority);
-
- /**
- * Returns the proposals which should be used to initiate a connection with a specific
- * host.
- *
- * The proposals of type proposal_substructure_t * are returned over the given iterator
- * and have to be destroyed by the caller.
- *
- *
- * @param this calling object
- * @param host host information used to find the correct proposals
- * @param list iterator where the proposals are written to
- *
- * @return
- * - OUT_OF_RES
- * - NOT_FOUND (not yet implemented)
- * - SUCCESS
- */
- status_t (*get_proposals_for_host) (configuration_manager_t *this, host_t *host, linked_list_iterator_t *list);
-
- /**
- * Checks the suggested proposals passed as iterator in and selects one proposal to be sent as selection
- * of this proposals.
- *
- * Currently there is no check implemented. The first suggested proposal is cloned and then as selected returned.
- *
- *
- * @param this calling object
- * @param host host information used to find the correct proposals
- * @param in iterator with suggested proposals of type proposal_substructure_t *
- * @param out The selected proposals of type proposal_substructure_t * are written to this iterator
- *
- * @return
- * - OUT_OF_RES
- * - FAILED
- * - NOT_FOUND (not yet implemented)
- * - SUCCESS
- */
- status_t (*select_proposals_for_host) (configuration_manager_t *this, host_t *host, linked_list_iterator_t *in, linked_list_iterator_t *out);
-
- /**
- * Returns the transforms of type crypter_t, signer_t and prf_t as specified in given proposal.
- *
- *
- * @param this calling object
- * @param host host information
- * @param proposals iterator with selected proposals
- * @param[out] encryption_algorithm
- * @param[out] pseudo_random_function
- * @param[out] integrity_algorithm
- *
- * @return
- * - OUT_OF_RES
- * - FAILED
- * - NOT_FOUND (not yet implemented)
- * - SUCCESS
- */
- status_t (*get_transforms_for_host_and_proposals) (configuration_manager_t *this, host_t *host, linked_list_iterator_t *proposals,encryption_algorithm_t *encryption_algorithm,pseudo_random_function_t *pseudo_random_function, integrity_algorithm_t *integrity_algorithm);
-
- /**
- * Checks if a given dh_group number is allowed for a specific host
- *
- *
- * @param this calling object
- * @param host host information
- * @param group DH group number to check if allowed
- * @param[out] allowed will be set to TRUE if group number is allowed, FALSE otherwise
- *
- * @return
- * - FAILED
- * - NOT_FOUND (not yet implemented)
- * - SUCCESS
- */
- status_t (*is_dh_group_allowed_for_host) (configuration_manager_t *this, host_t *host, diffie_hellman_group_t group, bool *allowed);
-
- /**
- * Destroys configuration manager
- *
- *
- * @param this calling object
- * @return
- * - SUCCESS
- */
- status_t (*destroy) (configuration_manager_t *this);
-};
-
-/**
- * Creates the mighty configuration manager
- *
- * @return
- * - pointer to created manager object if succeeded
- * - NULL if memory allocation failed
- */
-configuration_manager_t *configuration_manager_create();
-
-#endif /*CONFIGURATION_MANAGER_H_*/
diff --git a/Source/charon/daemon.c b/Source/charon/daemon.c
index d856a5dec..3eef8d661 100644
--- a/Source/charon/daemon.c
+++ b/Source/charon/daemon.c
@@ -28,7 +28,7 @@
#include <types.h>
-#include <ike_sa_manager.h>
+#include <sa/ike_sa_manager.h>
#include <threads/sender.h>
#include <threads/receiver.h>
#include <threads/scheduler.h>
diff --git a/Source/charon/encoding/message.c b/Source/charon/encoding/message.c
index d32126ec0..5a6501d54 100644
--- a/Source/charon/encoding/message.c
+++ b/Source/charon/encoding/message.c
@@ -26,7 +26,7 @@
#include <types.h>
#include <globals.h>
-#include <ike_sa_id.h>
+#include <sa/ike_sa_id.h>
#include <encoding/generator.h>
#include <encoding/parser.h>
#include <utils/linked_list.h>
diff --git a/Source/charon/encoding/message.h b/Source/charon/encoding/message.h
index 960be94af..106160407 100644
--- a/Source/charon/encoding/message.h
+++ b/Source/charon/encoding/message.h
@@ -24,7 +24,7 @@
#define MESSAGE_H_
#include <types.h>
-#include <ike_sa_id.h>
+#include <sa/ike_sa_id.h>
#include <network/packet.h>
#include <encoding/payloads/ike_header.h>
#include <utils/linked_list.h>
diff --git a/Source/charon/globals.h b/Source/charon/globals.h
index d3cfb0896..39dc841c6 100644
--- a/Source/charon/globals.h
+++ b/Source/charon/globals.h
@@ -23,13 +23,13 @@
#ifndef GLOBALS_H_
#define GLOBALS_H_
-#include <ike_sa_manager.h>
+#include <sa/ike_sa_manager.h>
#include <queues/send_queue.h>
#include <queues/job_queue.h>
#include <network/socket.h>
#include <queues/event_queue.h>
#include <utils/logger_manager.h>
-#include <configuration_manager.h>
+#include <config/configuration_manager.h>
extern socket_t *global_socket;
diff --git a/Source/charon/queues/jobs/delete_ike_sa_job.h b/Source/charon/queues/jobs/delete_ike_sa_job.h
index dd6ad8835..fe7c03f57 100644
--- a/Source/charon/queues/jobs/delete_ike_sa_job.h
+++ b/Source/charon/queues/jobs/delete_ike_sa_job.h
@@ -24,7 +24,7 @@
#define DELETE_IKE_SA_JOB_H_
#include <types.h>
-#include <ike_sa_id.h>
+#include <sa/ike_sa_id.h>
#include <queues/jobs/job.h>
diff --git a/Source/charon/ike_sa.c b/Source/charon/sa/ike_sa.c
index bd1669284..9747391f4 100644
--- a/Source/charon/ike_sa.c
+++ b/Source/charon/sa/ike_sa.c
@@ -37,8 +37,8 @@
#include <encoding/payloads/ke_payload.h>
#include <encoding/payloads/transform_substructure.h>
#include <encoding/payloads/transform_attribute.h>
-#include <states/initiator_init.h>
-#include <states/responder_init.h>
+#include <sa/states/initiator_init.h>
+#include <sa/states/responder_init.h>
diff --git a/Source/charon/ike_sa.h b/Source/charon/sa/ike_sa.h
index 5faddc4ff..34e95ab9a 100644
--- a/Source/charon/ike_sa.h
+++ b/Source/charon/sa/ike_sa.h
@@ -26,10 +26,10 @@
#include <types.h>
#include <encoding/message.h>
-#include <ike_sa_id.h>
+#include <sa/ike_sa_id.h>
#include <utils/logger.h>
#include <utils/randomizer.h>
-#include <states/state.h>
+#include <sa/states/state.h>
#include <transforms/prfs/prf.h>
#include <transforms/crypters/crypter.h>
#include <transforms/signers/signer.h>
diff --git a/Source/charon/ike_sa_id.c b/Source/charon/sa/ike_sa_id.c
index 52b1a9c8d..52b1a9c8d 100644
--- a/Source/charon/ike_sa_id.c
+++ b/Source/charon/sa/ike_sa_id.c
diff --git a/Source/charon/ike_sa_id.h b/Source/charon/sa/ike_sa_id.h
index f7e0e6540..f7e0e6540 100644
--- a/Source/charon/ike_sa_id.h
+++ b/Source/charon/sa/ike_sa_id.h
diff --git a/Source/charon/ike_sa_manager.c b/Source/charon/sa/ike_sa_manager.c
index ed60e6d87..def7d6d40 100644
--- a/Source/charon/ike_sa_manager.c
+++ b/Source/charon/sa/ike_sa_manager.c
@@ -26,7 +26,7 @@
#include "ike_sa_manager.h"
#include <globals.h>
-#include <ike_sa_id.h>
+#include <sa/ike_sa_id.h>
#include <utils/allocator.h>
#include <utils/logger.h>
#include <utils/logger_manager.h>
diff --git a/Source/charon/ike_sa_manager.h b/Source/charon/sa/ike_sa_manager.h
index 71ac33bc2..25d6c4c1a 100644
--- a/Source/charon/ike_sa_manager.h
+++ b/Source/charon/sa/ike_sa_manager.h
@@ -24,7 +24,7 @@
#define IKE_SA_MANAGER_H_
#include <types.h>
-#include <ike_sa.h>
+#include <sa/ike_sa.h>
/**
diff --git a/Source/charon/testcases/ike_sa_id_test.c b/Source/charon/testcases/ike_sa_id_test.c
index e0a0e7a46..7864c98fe 100644
--- a/Source/charon/testcases/ike_sa_id_test.c
+++ b/Source/charon/testcases/ike_sa_id_test.c
@@ -22,7 +22,7 @@
#include "ike_sa_id_test.h"
-#include <ike_sa_id.h>
+#include <sa/ike_sa_id.h>
/*
* described in Header-File
diff --git a/Source/charon/testcases/ike_sa_manager_test.c b/Source/charon/testcases/ike_sa_manager_test.c
index c54f5513a..df6f034c8 100644
--- a/Source/charon/testcases/ike_sa_manager_test.c
+++ b/Source/charon/testcases/ike_sa_manager_test.c
@@ -27,7 +27,7 @@
#include "ike_sa_manager_test.h"
#include <types.h>
-#include <ike_sa_manager.h>
+#include <sa/ike_sa_manager.h>
static struct ike_sa_manager_test_struct_s {
diff --git a/Source/charon/testcases/ike_sa_test.c b/Source/charon/testcases/ike_sa_test.c
index 68c6e84b0..0d8d9c64f 100644
--- a/Source/charon/testcases/ike_sa_test.c
+++ b/Source/charon/testcases/ike_sa_test.c
@@ -24,7 +24,7 @@
#include <types.h>
#include <encoding/message.h>
-#include <ike_sa.h>
+#include <sa/ike_sa.h>
void test_ike_sa(tester_t *tester)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 07:19:55 +0000