From 4a962238848168cba23363854be971b17e04aa92 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 23 Nov 2005 09:57:18 +0000 Subject: [PATCH] - created encoding package --- Source/charon/configuration_manager.c | 8 ++++---- Source/charon/configuration_manager.h | 2 +- Source/charon/{ => encoding}/generator.c | 14 ++++++------- Source/charon/{ => encoding}/generator.h | 4 ++-- Source/charon/{ => encoding}/message.c | 8 ++++---- Source/charon/{ => encoding}/message.h | 2 +- Source/charon/{ => encoding}/parser.c | 18 ++++++++--------- Source/charon/{ => encoding}/parser.h | 4 ++-- .../{ => encoding}/payloads/encodings.c | 0 .../{ => encoding}/payloads/encodings.h | 0 .../{ => encoding}/payloads/ike_header.c | 2 +- .../{ => encoding}/payloads/ike_header.h | 2 +- .../{ => encoding}/payloads/ke_payload.c | 2 +- .../{ => encoding}/payloads/ke_payload.h | 4 ++-- .../{ => encoding}/payloads/nonce_payload.c | 2 +- .../{ => encoding}/payloads/nonce_payload.h | 2 +- .../{ => encoding}/payloads/notify_payload.c | 2 +- .../{ => encoding}/payloads/notify_payload.h | 2 +- .../charon/{ => encoding}/payloads/payload.c | 10 +++++----- .../charon/{ => encoding}/payloads/payload.h | 2 +- .../payloads/proposal_substructure.c | 4 ++-- .../payloads/proposal_substructure.h | 4 ++-- .../{ => encoding}/payloads/sa_payload.c | 2 +- .../{ => encoding}/payloads/sa_payload.h | 4 ++-- .../payloads/transform_attribute.c | 2 +- .../payloads/transform_attribute.h | 2 +- .../payloads/transform_substructure.c | 4 ++-- .../payloads/transform_substructure.h | 4 ++-- Source/charon/ike_sa.c | 10 +++++----- Source/charon/ike_sa.h | 2 +- Source/charon/states/ike_sa_init_requested.c | 6 +++--- Source/charon/states/initiator_init.c | 6 +++--- Source/charon/states/responder_init.c | 6 +++--- Source/charon/states/state.h | 2 +- Source/charon/testcases/diffie_hellman_test.c | 2 +- Source/charon/testcases/generator_test.c | 20 +++++++++---------- Source/charon/testcases/ike_sa_test.c | 2 +- Source/charon/testcases/parser_test.c | 16 +++++++-------- Source/charon/testcases/receiver_test.c | 2 +- Source/charon/transforms/crypters/crypter.h | 2 +- Source/charon/transforms/diffie_hellman.c | 1 - Source/charon/transforms/diffie_hellman.h | 2 +- Source/charon/transforms/prfs/prf.h | 2 +- Source/charon/transforms/signers/signer.h | 2 +- 44 files changed, 99 insertions(+), 100 deletions(-) rename Source/charon/{ => encoding}/generator.c (99%) rename Source/charon/{ => encoding}/generator.h (96%) rename Source/charon/{ => encoding}/message.c (99%) rename Source/charon/{ => encoding}/message.h (99%) rename Source/charon/{ => encoding}/parser.c (98%) rename Source/charon/{ => encoding}/parser.h (96%) rename Source/charon/{ => encoding}/payloads/encodings.c (100%) rename Source/charon/{ => encoding}/payloads/encodings.h (100%) rename Source/charon/{ => encoding}/payloads/ike_header.c (99%) rename Source/charon/{ => encoding}/payloads/ike_header.h (99%) rename Source/charon/{ => encoding}/payloads/ke_payload.c (99%) rename Source/charon/{ => encoding}/payloads/ke_payload.h (96%) rename Source/charon/{ => encoding}/payloads/nonce_payload.c (99%) rename Source/charon/{ => encoding}/payloads/nonce_payload.h (98%) rename Source/charon/{ => encoding}/payloads/notify_payload.c (99%) rename Source/charon/{ => encoding}/payloads/notify_payload.h (99%) rename Source/charon/{ => encoding}/payloads/payload.c (91%) rename Source/charon/{ => encoding}/payloads/payload.h (99%) rename Source/charon/{ => encoding}/payloads/proposal_substructure.c (99%) rename Source/charon/{ => encoding}/payloads/proposal_substructure.h (98%) rename Source/charon/{ => encoding}/payloads/sa_payload.c (99%) rename Source/charon/{ => encoding}/payloads/sa_payload.h (97%) rename Source/charon/{ => encoding}/payloads/transform_attribute.c (99%) rename Source/charon/{ => encoding}/payloads/transform_attribute.h (99%) rename Source/charon/{ => encoding}/payloads/transform_substructure.c (99%) rename Source/charon/{ => encoding}/payloads/transform_substructure.h (98%) diff --git a/Source/charon/configuration_manager.c b/Source/charon/configuration_manager.c index 740946fe8..3b1488cf6 100644 --- a/Source/charon/configuration_manager.c +++ b/Source/charon/configuration_manager.c @@ -29,10 +29,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include /** * Private data of an configuration_t object diff --git a/Source/charon/configuration_manager.h b/Source/charon/configuration_manager.h index 3fd902420..b192c0cf7 100644 --- a/Source/charon/configuration_manager.h +++ b/Source/charon/configuration_manager.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include 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 10b0c8c9e..734c089a0 100644 --- a/Source/charon/generator.c +++ b/Source/charon/encoding/generator.c @@ -33,13 +33,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /** * 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 efad1c183..312ac0054 100644 --- a/Source/charon/generator.h +++ b/Source/charon/encoding/generator.h @@ -24,8 +24,8 @@ #define GENERATOR_H_ #include -#include -#include +#include +#include /** * 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 cb48e5061..d32126ec0 100644 --- a/Source/charon/message.c +++ b/Source/charon/encoding/message.c @@ -27,13 +27,13 @@ #include #include #include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include /** 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 0385bd7f8..960be94af 100644 --- a/Source/charon/message.h +++ b/Source/charon/encoding/message.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include 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 22b60bdc4..cf7d0b8ee 100644 --- a/Source/charon/parser.c +++ b/Source/charon/encoding/parser.c @@ -31,15 +31,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include 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 bde0bbe43..9a99fabb4 100644 --- a/Source/charon/parser.h +++ b/Source/charon/encoding/parser.h @@ -24,8 +24,8 @@ #define PARSER_H_ #include -#include -#include +#include +#include /** 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 8152e33da..1f1c34253 100644 --- a/Source/charon/payloads/ike_header.c +++ b/Source/charon/encoding/payloads/ike_header.c @@ -28,7 +28,7 @@ #include "ike_header.h" -#include +#include #include 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 88bcbcfb0..ce52b55df 100644 --- a/Source/charon/payloads/ike_header.h +++ b/Source/charon/encoding/payloads/ike_header.h @@ -27,7 +27,7 @@ #define IKE_HEADER_H_ #include -#include +#include /** * 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 76f9b6f4e..478519634 100644 --- a/Source/charon/payloads/ke_payload.c +++ b/Source/charon/encoding/payloads/ke_payload.c @@ -29,7 +29,7 @@ #include "ke_payload.h" -#include +#include #include 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 84844010e..8855941f1 100644 --- a/Source/charon/payloads/ke_payload.h +++ b/Source/charon/encoding/payloads/ke_payload.h @@ -28,8 +28,8 @@ #define KE_PAYLOAD_H_ #include -#include -#include +#include +#include #include /** 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 4dc10c62f..fa3730e2f 100644 --- a/Source/charon/payloads/nonce_payload.c +++ b/Source/charon/encoding/payloads/nonce_payload.c @@ -27,7 +27,7 @@ #include "nonce_payload.h" -#include +#include #include 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 918dc8e88..7768fa990 100644 --- a/Source/charon/payloads/nonce_payload.h +++ b/Source/charon/encoding/payloads/nonce_payload.h @@ -26,7 +26,7 @@ #define NONCE_PAYLOAD_H_ #include -#include +#include /** * 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 f430282d5..adcde11a2 100644 --- a/Source/charon/payloads/notify_payload.c +++ b/Source/charon/encoding/payloads/notify_payload.c @@ -29,7 +29,7 @@ #include "notify_payload.h" -#include +#include #include /** 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 026be97bc..cf4235fc3 100644 --- a/Source/charon/payloads/notify_payload.h +++ b/Source/charon/encoding/payloads/notify_payload.h @@ -29,7 +29,7 @@ #define NOTIFY_PAYLOAD_H_ #include -#include +#include #include /** 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 322ec600e..a2333f6af 100644 --- a/Source/charon/payloads/payload.c +++ b/Source/charon/encoding/payloads/payload.c @@ -24,11 +24,11 @@ #include "payload.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include 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 e88d9e6c7..9d8b753cb 100644 --- a/Source/charon/payloads/payload.h +++ b/Source/charon/encoding/payloads/payload.h @@ -24,9 +24,9 @@ #ifndef PAYLOAD_H_ #define PAYLOAD_H_ -#include #include #include +#include /** 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 511224aa4..b53633fb5 100644 --- a/Source/charon/payloads/proposal_substructure.c +++ b/Source/charon/encoding/payloads/proposal_substructure.c @@ -27,8 +27,8 @@ #include "proposal_substructure.h" -#include -#include +#include +#include #include #include #include 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 91b06067f..1da42d10d 100644 --- a/Source/charon/payloads/proposal_substructure.h +++ b/Source/charon/encoding/payloads/proposal_substructure.h @@ -26,8 +26,8 @@ #define PROPOSAL_SUBSTRUCTURE_H_ #include -#include -#include +#include +#include #include /** 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 ee88fa37c..83eb62acd 100644 --- a/Source/charon/payloads/sa_payload.c +++ b/Source/charon/encoding/payloads/sa_payload.c @@ -28,7 +28,7 @@ #include "sa_payload.h" -#include +#include #include #include 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 42c2a7414..f13282de9 100644 --- a/Source/charon/payloads/sa_payload.h +++ b/Source/charon/encoding/payloads/sa_payload.h @@ -27,8 +27,8 @@ #define SA_PAYLOAD_H_ #include -#include -#include +#include +#include #include /** 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 4fdcf38d9..9aed1e332 100644 --- a/Source/charon/payloads/transform_attribute.c +++ b/Source/charon/encoding/payloads/transform_attribute.c @@ -27,7 +27,7 @@ #include "transform_attribute.h" -#include +#include #include #include 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 4cf289ca6..7cc72f207 100644 --- a/Source/charon/payloads/transform_attribute.h +++ b/Source/charon/encoding/payloads/transform_attribute.h @@ -26,7 +26,7 @@ #define TRANSFORM_ATTRIBUTE_H_ #include -#include +#include /** 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 e65c590d1..d44d4c4f8 100644 --- a/Source/charon/payloads/transform_substructure.c +++ b/Source/charon/encoding/payloads/transform_substructure.c @@ -27,8 +27,8 @@ #include "transform_substructure.h" -#include -#include +#include +#include #include #include #include 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 924dfe754..1be66597e 100644 --- a/Source/charon/payloads/transform_substructure.h +++ b/Source/charon/encoding/payloads/transform_substructure.h @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/Source/charon/ike_sa.c b/Source/charon/ike_sa.c index bd7af05ea..bd1669284 100644 --- a/Source/charon/ike_sa.c +++ b/Source/charon/ike_sa.c @@ -32,11 +32,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/Source/charon/ike_sa.h b/Source/charon/ike_sa.h index b47d8e571..5faddc4ff 100644 --- a/Source/charon/ike_sa.h +++ b/Source/charon/ike_sa.h @@ -25,7 +25,7 @@ #define IKE_SA_H_ #include -#include +#include #include #include #include diff --git a/Source/charon/states/ike_sa_init_requested.c b/Source/charon/states/ike_sa_init_requested.c index 4d545309d..ea03602a9 100644 --- a/Source/charon/states/ike_sa_init_requested.c +++ b/Source/charon/states/ike_sa_init_requested.c @@ -24,9 +24,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include /** diff --git a/Source/charon/states/initiator_init.c b/Source/charon/states/initiator_init.c index 265bf3afa..d70db6937 100644 --- a/Source/charon/states/initiator_init.c +++ b/Source/charon/states/initiator_init.c @@ -28,9 +28,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include /** diff --git a/Source/charon/states/responder_init.c b/Source/charon/states/responder_init.c index 869d868e9..7b2f4998f 100644 --- a/Source/charon/states/responder_init.c +++ b/Source/charon/states/responder_init.c @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include /** diff --git a/Source/charon/states/state.h b/Source/charon/states/state.h index 13a51338b..305199f3f 100644 --- a/Source/charon/states/state.h +++ b/Source/charon/states/state.h @@ -25,7 +25,7 @@ #include #include -#include +#include 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 7f5da9cf1..83758c908 100644 --- a/Source/charon/testcases/diffie_hellman_test.c +++ b/Source/charon/testcases/diffie_hellman_test.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include /* * described in Header-File diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c index 28d92048b..01090f747 100644 --- a/Source/charon/testcases/generator_test.c +++ b/Source/charon/testcases/generator_test.c @@ -25,19 +25,19 @@ #include "generator_test.h" #include -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* * Described in Header diff --git a/Source/charon/testcases/ike_sa_test.c b/Source/charon/testcases/ike_sa_test.c index 60496706a..68c6e84b0 100644 --- 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 -#include +#include #include void test_ike_sa(tester_t *tester) diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c index a94ff6486..85705a1f3 100644 --- a/Source/charon/testcases/parser_test.c +++ b/Source/charon/testcases/parser_test.c @@ -23,16 +23,16 @@ #include "parser_test.h" -#include -#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include extern logger_manager_t *global_logger_manager; diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c index 44ea6f37d..6a0cf0a7e 100644 --- a/Source/charon/testcases/receiver_test.c +++ b/Source/charon/testcases/receiver_test.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include /** diff --git a/Source/charon/transforms/crypters/crypter.h b/Source/charon/transforms/crypters/crypter.h index 91ed54573..97a8ad81d 100644 --- 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 +#include /** diff --git a/Source/charon/transforms/diffie_hellman.c b/Source/charon/transforms/diffie_hellman.c index cd2721bd9..2acd0d960 100644 --- a/Source/charon/transforms/diffie_hellman.c +++ b/Source/charon/transforms/diffie_hellman.c @@ -27,7 +27,6 @@ #include "diffie_hellman.h" -#include #include #include #include diff --git a/Source/charon/transforms/diffie_hellman.h b/Source/charon/transforms/diffie_hellman.h index ff3921e44..e775cbb15 100644 --- a/Source/charon/transforms/diffie_hellman.h +++ b/Source/charon/transforms/diffie_hellman.h @@ -24,7 +24,7 @@ #define DIFFIE_HELLMAN_H_ #include -#include +#include /** * Object representing a diffie hellman exchange diff --git a/Source/charon/transforms/prfs/prf.h b/Source/charon/transforms/prfs/prf.h index 72d543b34..da624a0f0 100644 --- 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 +#include /** diff --git a/Source/charon/transforms/signers/signer.h b/Source/charon/transforms/signers/signer.h index 3dbc72f88..d179b1317 100644 --- 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 +#include /**