- created encoding package

diff --git a/Source/charon/configuration_manager.c b/Source/charon/configuration_manager.c
index 740946fe8c02866333ec79024332df4e644ecb75..3b1488cf6c98418a762247a4d1ce1726bcb6768b 100644 (file)
--- a/Source/charon/configuration_manager.c
+++ b/Source/charon/configuration_manager.c
@@ -29,10 +29,10 @@
 #include <types.h>
 #include <globals.h>
 #include <utils/allocator.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/proposal_substructure.h>
-#include <payloads/ke_payload.h>
-#include <payloads/transform_attribute.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

diff --git a/Source/charon/configuration_manager.h b/Source/charon/configuration_manager.h
index 3fd902420ec5bfc4d47f2f5f67b2284471f79036..b192c0cf78d1b448b063c2261d742d41eefaa6d3 100644 (file)
--- a/Source/charon/configuration_manager.h
+++ b/Source/charon/configuration_manager.h
@@ -26,7 +26,7 @@
 #include <types.h>
 #include <utils/linked_list.h>
 #include <utils/host.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 #include <transforms/prfs/prf.h>
 #include <transforms/signers/signer.h>
 #include <transforms/crypters/crypter.h>

diff --git a/Source/charon/generator.c b/Source/charon/encoding/generator.c
similarity index 99%
rename from Source/charon/generator.c
rename to Source/charon/encoding/generator.c
index 10b0c8c9ed350926df3196e78f6364cc233b1662..734c089a073e56c56bc3e14fea9740a28983ea35 100644 (file)
--- a/Source/charon/generator.c
+++ b/Source/charon/encoding/generator.c
@@ -33,13 +33,13 @@
 #include <utils/allocator.h>
 #include <utils/linked_list.h>
 #include <utils/logger_manager.h>
-#include <payloads/payload.h>
-#include <payloads/proposal_substructure.h>
-#include <payloads/transform_substructure.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/notify_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/proposal_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/notify_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 
 /**
  * Private part of a generator_t object

diff --git a/Source/charon/generator.h b/Source/charon/encoding/generator.h
similarity index 96%
rename from Source/charon/generator.h
rename to Source/charon/encoding/generator.h
index efad1c18364e7d6bbfca0f88123d21198b7c7de9..312ac00548068b3e784c03941d7371885841dd84 100644 (file)
--- a/Source/charon/generator.h
+++ b/Source/charon/encoding/generator.h
@@ -24,8 +24,8 @@
 #define GENERATOR_H_
 
 #include <types.h>
-#include <payloads/encodings.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/payload.h>
 
 /**
  * Generating is done in a data buffer.

diff --git a/Source/charon/message.c b/Source/charon/encoding/message.c
similarity index 99%
rename from Source/charon/message.c
rename to Source/charon/encoding/message.c
index cb48e506194233b3fed3e4e01351e501d3fc1e44..d32126ec0870e335efe4e5023b7cdc941889284f 100644 (file)
--- a/Source/charon/message.c
+++ b/Source/charon/encoding/message.c
@@ -27,13 +27,13 @@
 #include <types.h>
 #include <globals.h>
 #include <ike_sa_id.h>
-#include <generator.h>
-#include <parser.h>
+#include <encoding/generator.h>
+#include <encoding/parser.h>
 #include <utils/linked_list.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
-#include <payloads/encodings.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/payload.h>
 
 
 /**

diff --git a/Source/charon/message.h b/Source/charon/encoding/message.h
similarity index 99%
rename from Source/charon/message.h
rename to Source/charon/encoding/message.h
index 0385bd7f8b555b21f70bd43995362bf2b1ecf750..960be94af032d9559ac81a2afbb080a3a0f1559c 100644 (file)
--- a/Source/charon/message.h
+++ b/Source/charon/encoding/message.h
@@ -26,7 +26,7 @@
 #include <types.h>
 #include <ike_sa_id.h>
 #include <network/packet.h>
-#include <payloads/ike_header.h>
+#include <encoding/payloads/ike_header.h>
 #include <utils/linked_list.h>
 
 

diff --git a/Source/charon/parser.c b/Source/charon/encoding/parser.c
similarity index 98%
rename from Source/charon/parser.c
rename to Source/charon/encoding/parser.c
index 22b60bdc4ca5e8150d6e768562cb2cf575fc53f4..cf7d0b8eece2a60ed64b3d18038ed97c7604debc 100644 (file)
--- a/Source/charon/parser.c
+++ b/Source/charon/encoding/parser.c
@@ -31,15 +31,15 @@
 #include <utils/allocator.h>
 #include <utils/logger.h>
 #include <utils/linked_list.h>
-#include <payloads/encodings.h>
-#include <payloads/payload.h>
-#include <payloads/sa_payload.h>
-#include <payloads/proposal_substructure.h>
-#include <payloads/transform_substructure.h>
-#include <payloads/transform_attribute.h>
-#include <payloads/ke_payload.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/notify_payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/proposal_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
+#include <encoding/payloads/transform_attribute.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/notify_payload.h>
 
 
 

diff --git a/Source/charon/parser.h b/Source/charon/encoding/parser.h
similarity index 96%
rename from Source/charon/parser.h
rename to Source/charon/encoding/parser.h
index bde0bbe434f4c2abe47ee26a0d223aa7096f6b13..9a99fabb4efd430f1c69c6a669df0fe4a9a65ced 100644 (file)
--- a/Source/charon/parser.h
+++ b/Source/charon/encoding/parser.h
@@ -24,8 +24,8 @@
 #define PARSER_H_
 
 #include <types.h>
-#include <payloads/encodings.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/payload.h>
 
 
 /**

diff --git a/Source/charon/payloads/encodings.c b/Source/charon/encoding/payloads/encodings.c
similarity index 100%
rename from Source/charon/payloads/encodings.c
rename to Source/charon/encoding/payloads/encodings.c

diff --git a/Source/charon/payloads/encodings.h b/Source/charon/encoding/payloads/encodings.h
similarity index 100%
rename from Source/charon/payloads/encodings.h
rename to Source/charon/encoding/payloads/encodings.h

diff --git a/Source/charon/payloads/ike_header.c b/Source/charon/encoding/payloads/ike_header.c
similarity index 99%
rename from Source/charon/payloads/ike_header.c
rename to Source/charon/encoding/payloads/ike_header.c
index 8152e33dafd48f8f52c4be7a0d42835fca8bf0e7..1f1c34253618a4899683c23e2043e242e7ca8430 100644 (file)
--- a/Source/charon/payloads/ike_header.c
+++ b/Source/charon/encoding/payloads/ike_header.c
@@ -28,7 +28,7 @@
 
 #include "ike_header.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 typedef struct private_ike_header_s private_ike_header_t;

diff --git a/Source/charon/payloads/ike_header.h b/Source/charon/encoding/payloads/ike_header.h
similarity index 99%
rename from Source/charon/payloads/ike_header.h
rename to Source/charon/encoding/payloads/ike_header.h
index 88bcbcfb05fb1911dd74453b15eed85a75fd3923..ce52b55dff9f1848f304a904dbe3130e89e0d585 100644 (file)
--- a/Source/charon/payloads/ike_header.h
+++ b/Source/charon/encoding/payloads/ike_header.h
@@ -27,7 +27,7 @@
 #define IKE_HEADER_H_
 
 #include <types.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/payload.h>
 
 /**
  * Major Version of IKEv2

diff --git a/Source/charon/payloads/ke_payload.c b/Source/charon/encoding/payloads/ke_payload.c
similarity index 99%
rename from Source/charon/payloads/ke_payload.c
rename to Source/charon/encoding/payloads/ke_payload.c
index 76f9b6f4ebfe78de160565537e4860566ed7ff83..4785196348a3e666cfe6076cfc417dc0cf2fd671 100644 (file)
--- a/Source/charon/payloads/ke_payload.c
+++ b/Source/charon/encoding/payloads/ke_payload.c
@@ -29,7 +29,7 @@
 
 #include "ke_payload.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 

diff --git a/Source/charon/payloads/ke_payload.h b/Source/charon/encoding/payloads/ke_payload.h
similarity index 96%
rename from Source/charon/payloads/ke_payload.h
rename to Source/charon/encoding/payloads/ke_payload.h
index 84844010e9c9a6a06b80c70de4932e44e1d2b3ae..8855941f1768898bbb621c19756f2e55fd8a13fc 100644 (file)
--- a/Source/charon/payloads/ke_payload.h
+++ b/Source/charon/encoding/payloads/ke_payload.h
@@ -28,8 +28,8 @@
 #define KE_PAYLOAD_H_
 
 #include <types.h>
-#include <payloads/payload.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/transform_substructure.h>
 #include <utils/linked_list.h>
 
 /**

diff --git a/Source/charon/payloads/nonce_payload.c b/Source/charon/encoding/payloads/nonce_payload.c
similarity index 99%
rename from Source/charon/payloads/nonce_payload.c
rename to Source/charon/encoding/payloads/nonce_payload.c
index 4dc10c62ff9cc74013f570ce71cb9c814ba43be8..fa3730e2fdfcae4333e2dab1bc4d0a43a1b03bf3 100644 (file)
--- a/Source/charon/payloads/nonce_payload.c
+++ b/Source/charon/encoding/payloads/nonce_payload.c
@@ -27,7 +27,7 @@
 
 #include "nonce_payload.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 

diff --git a/Source/charon/payloads/nonce_payload.h b/Source/charon/encoding/payloads/nonce_payload.h
similarity index 98%
rename from Source/charon/payloads/nonce_payload.h
rename to Source/charon/encoding/payloads/nonce_payload.h
index 918dc8e883441b13fd95bf5db0665a1987784520..7768fa99025862af299247e7b90126deb46dc946 100644 (file)
--- a/Source/charon/payloads/nonce_payload.h
+++ b/Source/charon/encoding/payloads/nonce_payload.h
@@ -26,7 +26,7 @@
 #define NONCE_PAYLOAD_H_
 
 #include <types.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/payload.h>
 
 /**
  * length of a nonce payload without a nonce in int

diff --git a/Source/charon/payloads/notify_payload.c b/Source/charon/encoding/payloads/notify_payload.c
similarity index 99%
rename from Source/charon/payloads/notify_payload.c
rename to Source/charon/encoding/payloads/notify_payload.c
index f430282d55378469b4c085cbbba6cbf4e1a8270f..adcde11a290f2661bd1fa68867327867021317f0 100644 (file)
--- a/Source/charon/payloads/notify_payload.c
+++ b/Source/charon/encoding/payloads/notify_payload.c
@@ -29,7 +29,7 @@
 
 #include "notify_payload.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 /**

diff --git a/Source/charon/payloads/notify_payload.h b/Source/charon/encoding/payloads/notify_payload.h
similarity index 99%
rename from Source/charon/payloads/notify_payload.h
rename to Source/charon/encoding/payloads/notify_payload.h
index 026be97bce9675fc53d3ccb3638a5f79972117ba..cf4235fc3883dc6f1080ee00128af1198dc1babe 100644 (file)
--- a/Source/charon/payloads/notify_payload.h
+++ b/Source/charon/encoding/payloads/notify_payload.h
@@ -29,7 +29,7 @@
 #define NOTIFY_PAYLOAD_H_
 
 #include <types.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/payload.h>
 #include <utils/linked_list.h>
 
 /**

diff --git a/Source/charon/payloads/payload.c b/Source/charon/encoding/payloads/payload.c
similarity index 91%
rename from Source/charon/payloads/payload.c
rename to Source/charon/encoding/payloads/payload.c
index 322ec600ed082bea590ae4e0eb7a71268b6387fe..a2333f6af3ed3fbc14b9131aba88532e85333893 100644 (file)
--- a/Source/charon/payloads/payload.c
+++ b/Source/charon/encoding/payloads/payload.c
@@ -24,11 +24,11 @@
 
 #include "payload.h"
 
-#include <payloads/ike_header.h>
-#include <payloads/sa_payload.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/notify_payload.h>
+#include <encoding/payloads/ike_header.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/notify_payload.h>
 
 
 

diff --git a/Source/charon/payloads/payload.h b/Source/charon/encoding/payloads/payload.h
similarity index 99%
rename from Source/charon/payloads/payload.h
rename to Source/charon/encoding/payloads/payload.h
index e88d9e6c7fd5412b01e85e29f76e2f1ce7f5b684..9d8b753cbab33b2dfe9c1c4cb7f2d91ed8e82e63 100644 (file)
--- a/Source/charon/payloads/payload.h
+++ b/Source/charon/encoding/payloads/payload.h
@@ -24,9 +24,9 @@
 #ifndef PAYLOAD_H_
 #define PAYLOAD_H_
 
-#include <payloads/encodings.h>
 #include <types.h>
 #include <definitions.h>
+#include <encoding/payloads/encodings.h>
 
 
 /**

diff --git a/Source/charon/payloads/proposal_substructure.c b/Source/charon/encoding/payloads/proposal_substructure.c
similarity index 99%
rename from Source/charon/payloads/proposal_substructure.c
rename to Source/charon/encoding/payloads/proposal_substructure.c
index 511224aa499166eb5789602d642a17c410bb7ea2..b53633fb5b79fbe64a6566f4815fad417e716cd5 100644 (file)
--- a/Source/charon/payloads/proposal_substructure.c
+++ b/Source/charon/encoding/payloads/proposal_substructure.c
@@ -27,8 +27,8 @@
 
 #include "proposal_substructure.h"
 
-#include <payloads/encodings.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/transform_substructure.h>
 #include <types.h>
 #include <utils/allocator.h>
 #include <utils/linked_list.h>

diff --git a/Source/charon/payloads/proposal_substructure.h b/Source/charon/encoding/payloads/proposal_substructure.h
similarity index 98%
rename from Source/charon/payloads/proposal_substructure.h
rename to Source/charon/encoding/payloads/proposal_substructure.h
index 91b06067fa61fc0ef373babdf326ea64a7b23e0a..1da42d10d371b14181309aeba305fe19a863fea1 100644 (file)
--- a/Source/charon/payloads/proposal_substructure.h
+++ b/Source/charon/encoding/payloads/proposal_substructure.h
@@ -26,8 +26,8 @@
 #define PROPOSAL_SUBSTRUCTURE_H_
 
 #include <types.h>
-#include <payloads/payload.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/transform_substructure.h>
 #include <utils/linked_list.h>
 
 /**

diff --git a/Source/charon/payloads/sa_payload.c b/Source/charon/encoding/payloads/sa_payload.c
similarity index 99%
rename from Source/charon/payloads/sa_payload.c
rename to Source/charon/encoding/payloads/sa_payload.c
index ee88fa37cfec91344db0458df1e448cfd30524c9..83eb62acde35e3ac469b7813be04ad0d3d4aeae0 100644 (file)
--- a/Source/charon/payloads/sa_payload.c
+++ b/Source/charon/encoding/payloads/sa_payload.c
@@ -28,7 +28,7 @@
 
 #include "sa_payload.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 #include <utils/linked_list.h>
 

diff --git a/Source/charon/payloads/sa_payload.h b/Source/charon/encoding/payloads/sa_payload.h
similarity index 97%
rename from Source/charon/payloads/sa_payload.h
rename to Source/charon/encoding/payloads/sa_payload.h
index 42c2a7414966652ec18c9b1dde8e0c786d5596c5..f13282de9294e62df018dfd1b230db988230cd04 100644 (file)
--- a/Source/charon/payloads/sa_payload.h
+++ b/Source/charon/encoding/payloads/sa_payload.h
@@ -27,8 +27,8 @@
 #define SA_PAYLOAD_H_
 
 #include <types.h>
-#include <payloads/payload.h>
-#include <payloads/proposal_substructure.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/proposal_substructure.h>
 #include <utils/linked_list.h>
 
 /**

diff --git a/Source/charon/payloads/transform_attribute.c b/Source/charon/encoding/payloads/transform_attribute.c
similarity index 99%
rename from Source/charon/payloads/transform_attribute.c
rename to Source/charon/encoding/payloads/transform_attribute.c
index 4fdcf38d91f37059849c22fe9bb3fbbbb7ca9e2d..9aed1e33207033c1d060e79d1dadbe8d808170b3 100644 (file)
--- a/Source/charon/payloads/transform_attribute.c
+++ b/Source/charon/encoding/payloads/transform_attribute.c
@@ -27,7 +27,7 @@
 
 #include "transform_attribute.h"
 
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <types.h>
 #include <utils/allocator.h>
 

diff --git a/Source/charon/payloads/transform_attribute.h b/Source/charon/encoding/payloads/transform_attribute.h
similarity index 99%
rename from Source/charon/payloads/transform_attribute.h
rename to Source/charon/encoding/payloads/transform_attribute.h
index 4cf289ca69b891f95914ebbde95f7666b2af4fa6..7cc72f2073817e0996a69f7968c1afc4bdc4a991 100644 (file)
--- a/Source/charon/payloads/transform_attribute.h
+++ b/Source/charon/encoding/payloads/transform_attribute.h
@@ -26,7 +26,7 @@
 #define TRANSFORM_ATTRIBUTE_H_
 
 #include <types.h>
-#include <payloads/payload.h>
+#include <encoding/payloads/payload.h>
 
 
 /**

diff --git a/Source/charon/payloads/transform_substructure.c b/Source/charon/encoding/payloads/transform_substructure.c
similarity index 99%
rename from Source/charon/payloads/transform_substructure.c
rename to Source/charon/encoding/payloads/transform_substructure.c
index e65c590d1361f2640ac9f851ffb3663f397117c9..d44d4c4f8c304c9384973c499883a58414368e7c 100644 (file)
--- a/Source/charon/payloads/transform_substructure.c
+++ b/Source/charon/encoding/payloads/transform_substructure.c
@@ -27,8 +27,8 @@
 
 #include "transform_substructure.h"
 
-#include <payloads/transform_attribute.h>
-#include <payloads/encodings.h>
+#include <encoding/payloads/transform_attribute.h>
+#include <encoding/payloads/encodings.h>
 #include <types.h>
 #include <utils/allocator.h>
 #include <utils/linked_list.h>

diff --git a/Source/charon/payloads/transform_substructure.h b/Source/charon/encoding/payloads/transform_substructure.h
similarity index 98%
rename from Source/charon/payloads/transform_substructure.h
rename to Source/charon/encoding/payloads/transform_substructure.h
index 924dfe754f04801deff1ab1c3f402e998329adec..1be66597ed5545bba336791781ddc0c41f6826c6 100644 (file)
--- a/Source/charon/payloads/transform_substructure.h
+++ b/Source/charon/encoding/payloads/transform_substructure.h
@@ -27,8 +27,8 @@
 
 #include <types.h>
 #include <definitions.h>
-#include <payloads/payload.h>
-#include <payloads/transform_attribute.h>
+#include <encoding/payloads/payload.h>
+#include <encoding/payloads/transform_attribute.h>
 #include <utils/linked_list.h>
 
 

diff --git a/Source/charon/ike_sa.c b/Source/charon/ike_sa.c
index bd7af05ea9fa17a7ac7dd77fced4eb8536acce0a..bd166928498404df744fc3bc2e538da3066920d4 100644 (file)
--- a/Source/charon/ike_sa.c
+++ b/Source/charon/ike_sa.c
@@ -32,11 +32,11 @@
 #include <utils/randomizer.h>
 #include <transforms/diffie_hellman.h>
 #include <transforms/prf_plus.h>
-#include <payloads/sa_payload.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/transform_substructure.h>
-#include <payloads/transform_attribute.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/nonce_payload.h>
+#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>
 

diff --git a/Source/charon/ike_sa.h b/Source/charon/ike_sa.h
index b47d8e571ddc0db27e5510bc7bb9c55c58e8b8de..5faddc4ffc7030b28246d26d9b9dd55abe018133 100644 (file)
--- a/Source/charon/ike_sa.h
+++ b/Source/charon/ike_sa.h
@@ -25,7 +25,7 @@
 #define IKE_SA_H_
 
 #include <types.h>
-#include <message.h>
+#include <encoding/message.h>
 #include <ike_sa_id.h>
 #include <utils/logger.h>
 #include <utils/randomizer.h>

diff --git a/Source/charon/states/ike_sa_init_requested.c b/Source/charon/states/ike_sa_init_requested.c
index 4d545309d610066278fe2440753ceaac786e3caf..ea03602a977cc918a0c3f490cfeb76ff1db59510 100644 (file)
--- a/Source/charon/states/ike_sa_init_requested.c
+++ b/Source/charon/states/ike_sa_init_requested.c
@@ -24,9 +24,9 @@
 
 #include <globals.h>
 #include <utils/allocator.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 #include <transforms/diffie_hellman.h>
 
 /**

diff --git a/Source/charon/states/initiator_init.c b/Source/charon/states/initiator_init.c
index 265bf3afa5d1bb6c28f715ce0813b7fd46e40c8b..d70db6937ecf0cecf5bed6c1fe561ddb78730a59 100644 (file)
--- a/Source/charon/states/initiator_init.c
+++ b/Source/charon/states/initiator_init.c
@@ -28,9 +28,9 @@
 #include <states/ike_sa_init_requested.h>
 #include <utils/allocator.h>
 #include <transforms/diffie_hellman.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 
 
 /**

diff --git a/Source/charon/states/responder_init.c b/Source/charon/states/responder_init.c
index 869d868e9e3cf24daa7254102643403a20275567..7b2f4998ffae3804fd24990ba55e7a882e7ba3c0 100644 (file)
--- a/Source/charon/states/responder_init.c
+++ b/Source/charon/states/responder_init.c
@@ -26,9 +26,9 @@
 #include <states/state.h>
 #include <states/ike_sa_init_responded.h>
 #include <utils/allocator.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 #include <transforms/diffie_hellman.h>
 
 /**

diff --git a/Source/charon/states/state.h b/Source/charon/states/state.h
index 13a51338b6f48fa2ebaee18f3df83b2b77c34c06..305199f3f48933740aff9763161586948772cd55 100644 (file)
--- a/Source/charon/states/state.h
+++ b/Source/charon/states/state.h
@@ -25,7 +25,7 @@
 
 #include <definitions.h>
 #include <types.h>
-#include <message.h>
+#include <encoding/message.h>
 
 extern mapping_t ike_sa_state_m[];
 

diff --git a/Source/charon/testcases/diffie_hellman_test.c b/Source/charon/testcases/diffie_hellman_test.c
index 7f5da9cf1eefa816a4822181068f3f331073906e..83758c9089d4205b5508cc517b532361e3a32497 100644 (file)
--- a/Source/charon/testcases/diffie_hellman_test.c
+++ b/Source/charon/testcases/diffie_hellman_test.c
@@ -27,7 +27,7 @@
 #include <globals.h>
 #include <utils/logger_manager.h>
 #include <utils/allocator.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 /* 
  * described in Header-File

diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c
index 28d92048b401bcfd027c8b5cc3306aa98ee6ab71..01090f7471f40eb76b9a2de953175bca71f295a3 100644 (file)
--- a/Source/charon/testcases/generator_test.c
+++ b/Source/charon/testcases/generator_test.c
@@ -25,19 +25,19 @@
 #include "generator_test.h"
 
 #include <globals.h>
-#include <generator.h>
+#include <encoding/generator.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
 #include <utils/logger.h>
-#include <payloads/encodings.h>
-#include <payloads/ike_header.h>
-#include <payloads/transform_attribute.h>
-#include <payloads/transform_substructure.h>
-#include <payloads/proposal_substructure.h>
-#include <payloads/sa_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/notify_payload.h>
-#include <payloads/nonce_payload.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/ike_header.h>
+#include <encoding/payloads/transform_attribute.h>
+#include <encoding/payloads/transform_substructure.h>
+#include <encoding/payloads/proposal_substructure.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/notify_payload.h>
+#include <encoding/payloads/nonce_payload.h>
 
 /*
  * Described in Header 

diff --git a/Source/charon/testcases/ike_sa_test.c b/Source/charon/testcases/ike_sa_test.c
index 60496706a7707e447f5dab0efc76bf0cd0424c8d..68c6e84b0085b0e59c79f6d9745356cdc63dc16c 100644 (file)
--- a/Source/charon/testcases/ike_sa_test.c
+++ b/Source/charon/testcases/ike_sa_test.c
@@ -23,7 +23,7 @@
 #include "ike_sa_test.h"
 
 #include <types.h>
-#include <message.h>
+#include <encoding/message.h>
 #include <ike_sa.h>
 
 void test_ike_sa(tester_t *tester)

diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c
index a94ff64864ddf227c43913f122ddb55f04558967..85705a1f3239f55e42b02ebbc084576e8437fad5 100644 (file)
--- a/Source/charon/testcases/parser_test.c
+++ b/Source/charon/testcases/parser_test.c
@@ -23,16 +23,16 @@
 
 #include "parser_test.h"
 
-#include <generator.h>
-#include <parser.h>
 #include <utils/allocator.h>
 #include <utils/logger_manager.h>
-#include <payloads/encodings.h>
-#include <payloads/ike_header.h>
-#include <payloads/sa_payload.h>
-#include <payloads/nonce_payload.h>
-#include <payloads/ke_payload.h>
-#include <payloads/notify_payload.h>
+#include <encoding/generator.h>
+#include <encoding/parser.h>
+#include <encoding/payloads/encodings.h>
+#include <encoding/payloads/ike_header.h>
+#include <encoding/payloads/sa_payload.h>
+#include <encoding/payloads/nonce_payload.h>
+#include <encoding/payloads/ke_payload.h>
+#include <encoding/payloads/notify_payload.h>
 
 
 extern logger_manager_t *global_logger_manager;

diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c
index 44ea6f37d15cc6cb48368f65821c615beec29c42..6a0cf0a7e5070d03fcac66eb70d2ed01e76ecab5 100644 (file)
--- a/Source/charon/testcases/receiver_test.c
+++ b/Source/charon/testcases/receiver_test.c
@@ -32,7 +32,7 @@
 #include <queues/send_queue.h>
 #include <queues/job_queue.h>
 #include <queues/jobs/incoming_packet_job.h>
-#include <payloads/encodings.h>
+#include <encoding/payloads/encodings.h>
 #include <utils/allocator.h>
 
 /**

diff --git a/Source/charon/transforms/crypters/crypter.h b/Source/charon/transforms/crypters/crypter.h
index 91ed545733c684f81cd33698eefd41ca6c99a9c3..97a8ad81d68dda223812e709fb023d481223474b 100644 (file)
--- a/Source/charon/transforms/crypters/crypter.h
+++ b/Source/charon/transforms/crypters/crypter.h
@@ -23,7 +23,7 @@
 #ifndef CRYPTER_H_
 #define CRYPTER_H_
 
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 
 /**

diff --git a/Source/charon/transforms/diffie_hellman.c b/Source/charon/transforms/diffie_hellman.c
index cd2721bd9333977b7e34fc376ca0208841669d58..2acd0d96041bf0d353d62a7327547a2dcc5c8eb9 100644 (file)
--- a/Source/charon/transforms/diffie_hellman.c
+++ b/Source/charon/transforms/diffie_hellman.c
@@ -27,7 +27,6 @@
 
 #include "diffie_hellman.h"
 
-#include <payloads/transform_substructure.h>
 #include <utils/allocator.h>
 #include <utils/randomizer.h>
 #include <utils/gmp_helper.h>

diff --git a/Source/charon/transforms/diffie_hellman.h b/Source/charon/transforms/diffie_hellman.h
index ff3921e44af8a6e6dd92f109071a25f8d18d1981..e775cbb150f479964e0e4623f4e4d5a240057cd7 100644 (file)
--- a/Source/charon/transforms/diffie_hellman.h
+++ b/Source/charon/transforms/diffie_hellman.h
@@ -24,7 +24,7 @@
 #define DIFFIE_HELLMAN_H_
 
 #include <types.h>
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 /**
  * Object representing a diffie hellman exchange

diff --git a/Source/charon/transforms/prfs/prf.h b/Source/charon/transforms/prfs/prf.h
index 72d543b346f873a6d8d8f804208f47d6cf418b59..da624a0f050b3ffec1581713189c2a5d86f3a82c 100644 (file)
--- a/Source/charon/transforms/prfs/prf.h
+++ b/Source/charon/transforms/prfs/prf.h
@@ -23,7 +23,7 @@
 #ifndef PRF_H_
 #define PRF_H_
 
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 
 /**

diff --git a/Source/charon/transforms/signers/signer.h b/Source/charon/transforms/signers/signer.h
index 3dbc72f88ebe4bb526b2083397dfaea38b837b18..d179b13175e796142e453ee71a3b4801721d1217 100644 (file)
--- a/Source/charon/transforms/signers/signer.h
+++ b/Source/charon/transforms/signers/signer.h
@@ -23,7 +23,7 @@
 #ifndef SIGNER_H_
 #define SIGNER_H_
 
-#include <payloads/transform_substructure.h>
+#include <encoding/payloads/transform_substructure.h>
 
 
 /**