- created encoding package

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

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>

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

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.

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>
 
 
 /**

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>
 
 

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>
 
 
 

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>
 
 
 /**

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;

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

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>
 
 

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>
 
 /**

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>
 
 

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

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>
 
 /**

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>
 
 /**

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>
 
 
 

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>
 
 
 /**

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>

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>
 
 /**

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>
 

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>
 
 /**

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>
 

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>
 
 
 /**

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>

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>
 
 

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>
 

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>

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>
 
 /**

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>
 
 
 /**

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>
 
 /**

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[];
 

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

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 

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)

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;

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>
 
 /**

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>
 
 
 /**

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>

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

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>
 
 
 /**

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>
 
 
 /**