From 3f6d1b13a7d53bf465c65687e18425d14a143af8 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Wed, 16 Nov 2011 12:40:09 +0000 Subject: Added additional IKEv1 payload and encoding identifiers --- src/libcharon/encoding/payloads/encodings.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/libcharon/encoding/payloads/encodings.c') diff --git a/src/libcharon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c index 85caeda82..d181d9303 100644 --- a/src/libcharon/encoding/payloads/encodings.c +++ b/src/libcharon/encoding/payloads/encodings.c @@ -32,8 +32,11 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, "KEY_EXCHANGE_DATA", "NOTIFICATION_DATA", "PROPOSALS", + "PROPOSALS_V1", "TRANSFORMS", + "TRANSFORMS_V1", "TRANSFORM_ATTRIBUTES", + "TRANSFORM_ATTRIBUTES_V1", "CONFIGURATION_ATTRIBUTES", "CONFIGURATION_ATTRIBUTE_VALUE", "ATTRIBUTE_FORMAT", -- cgit v1.2.3 From 683d83ed3ef6c920a59f6d23d0f44c66fc6ded42 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 17 Nov 2011 11:16:02 +0100 Subject: Extended KE payload for IKEv1 support --- src/libcharon/encoding/payloads/encodings.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libcharon/encoding/payloads/encodings.c') diff --git a/src/libcharon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c index d181d9303..582847048 100644 --- a/src/libcharon/encoding/payloads/encodings.c +++ b/src/libcharon/encoding/payloads/encodings.c @@ -30,6 +30,7 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, "SPI_SIZE", "SPI", "KEY_EXCHANGE_DATA", + "KEY_EXCHANGE_DATA_V1", "NOTIFICATION_DATA", "PROPOSALS", "PROPOSALS_V1", -- cgit v1.2.3 From ee50a2938557c4fa67a76304dbeb37abfe6ad253 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 17 Nov 2011 15:00:04 +0100 Subject: Implemented IKEv1 hash payload --- src/libcharon/encoding/payloads/encodings.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libcharon/encoding/payloads/encodings.c') diff --git a/src/libcharon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c index 582847048..303ccca8a 100644 --- a/src/libcharon/encoding/payloads/encodings.c +++ b/src/libcharon/encoding/payloads/encodings.c @@ -49,6 +49,7 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, "TS_TYPE", "ADDRESS", "NONCE_DATA", + "HASH_DATA", "ID_DATA", "AUTH_DATA", "CERT_DATA", -- cgit v1.2.3 From 95a26523afc0d2a997cd1d4f738c287ae045ae4e Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 17 Nov 2011 14:20:16 +0000 Subject: Use a generic encoding type for all variable length chunks --- src/libcharon/encoding/payloads/encodings.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/libcharon/encoding/payloads/encodings.c') diff --git a/src/libcharon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c index 303ccca8a..3fe2e6be6 100644 --- a/src/libcharon/encoding/payloads/encodings.c +++ b/src/libcharon/encoding/payloads/encodings.c @@ -17,7 +17,7 @@ #include "encodings.h" -ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, +ENUM(encoding_type_names, U_INT_4, IKE_SPI, "U_INT_4", "U_INT_8", "U_INT_16", @@ -29,9 +29,6 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, "HEADER_LENGTH", "SPI_SIZE", "SPI", - "KEY_EXCHANGE_DATA", - "KEY_EXCHANGE_DATA_V1", - "NOTIFICATION_DATA", "PROPOSALS", "PROPOSALS_V1", "TRANSFORMS", @@ -39,7 +36,6 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, "TRANSFORM_ATTRIBUTES", "TRANSFORM_ATTRIBUTES_V1", "CONFIGURATION_ATTRIBUTES", - "CONFIGURATION_ATTRIBUTE_VALUE", "ATTRIBUTE_FORMAT", "ATTRIBUTE_TYPE", "ATTRIBUTE_LENGTH_OR_VALUE", @@ -48,16 +44,6 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, "TRAFFIC_SELECTORS", "TS_TYPE", "ADDRESS", - "NONCE_DATA", - "HASH_DATA", - "ID_DATA", - "AUTH_DATA", - "CERT_DATA", - "CERTREQ_DATA", - "EAP_DATA", - "SPIS", - "VID_DATA", - "UNKNOWN_DATA", + "CHUNK_DATA", "IKE_SPI", - "ENCRYPTED_DATA", ); -- cgit v1.2.3 From f62a7c7c7192d791eb4c10e7ff4d09cf54c7d4da Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 17 Nov 2011 15:44:42 +0100 Subject: Use a generic list encoding rule we can use to specify the wrapped payload type --- src/libcharon/encoding/payloads/encodings.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/libcharon/encoding/payloads/encodings.c') diff --git a/src/libcharon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c index 3fe2e6be6..3dc8ee4ec 100644 --- a/src/libcharon/encoding/payloads/encodings.c +++ b/src/libcharon/encoding/payloads/encodings.c @@ -29,19 +29,11 @@ ENUM(encoding_type_names, U_INT_4, IKE_SPI, "HEADER_LENGTH", "SPI_SIZE", "SPI", - "PROPOSALS", - "PROPOSALS_V1", - "TRANSFORMS", - "TRANSFORMS_V1", - "TRANSFORM_ATTRIBUTES", - "TRANSFORM_ATTRIBUTES_V1", - "CONFIGURATION_ATTRIBUTES", "ATTRIBUTE_FORMAT", "ATTRIBUTE_TYPE", "ATTRIBUTE_LENGTH_OR_VALUE", "CONFIGURATION_ATTRIBUTE_LENGTH", "ATTRIBUTE_VALUE", - "TRAFFIC_SELECTORS", "TS_TYPE", "ADDRESS", "CHUNK_DATA", -- cgit v1.2.3 From 6f5f8ee4b59484e15cc1cba356cfe37b6c4a9c23 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 21 Nov 2011 11:53:23 +0100 Subject: Use modified encryption payload to encrypt/decrypt complete IKEv1 messages. --- src/libcharon/encoding/payloads/encodings.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libcharon/encoding/payloads/encodings.c') diff --git a/src/libcharon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c index 3dc8ee4ec..7306dcf10 100644 --- a/src/libcharon/encoding/payloads/encodings.c +++ b/src/libcharon/encoding/payloads/encodings.c @@ -17,7 +17,7 @@ #include "encodings.h" -ENUM(encoding_type_names, U_INT_4, IKE_SPI, +ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, "U_INT_4", "U_INT_8", "U_INT_16", @@ -38,4 +38,5 @@ ENUM(encoding_type_names, U_INT_4, IKE_SPI, "ADDRESS", "CHUNK_DATA", "IKE_SPI", + "ENCRYPTED", ); -- cgit v1.2.3 From 42a69b05abec61f145fc06f7cec68ef4deba76b0 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 21 Nov 2011 15:18:40 +0100 Subject: String for ENCRYPTED_DATA fixed. --- src/libcharon/encoding/payloads/encodings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcharon/encoding/payloads/encodings.c') diff --git a/src/libcharon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c index 7306dcf10..7515c947f 100644 --- a/src/libcharon/encoding/payloads/encodings.c +++ b/src/libcharon/encoding/payloads/encodings.c @@ -38,5 +38,5 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, "ADDRESS", "CHUNK_DATA", "IKE_SPI", - "ENCRYPTED", + "ENCRYPTED_DATA", ); -- cgit v1.2.3 From c390569a76524a72e25a8885f3f8dc920700207d Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Fri, 20 Jan 2012 15:00:06 +0100 Subject: Renamed CONFIGURATION_ATTRIBUTE_LENGTH to streamline it with other ATTRIBUTE rules --- src/libcharon/encoding/payloads/encodings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcharon/encoding/payloads/encodings.c') diff --git a/src/libcharon/encoding/payloads/encodings.c b/src/libcharon/encoding/payloads/encodings.c index 7515c947f..62de81120 100644 --- a/src/libcharon/encoding/payloads/encodings.c +++ b/src/libcharon/encoding/payloads/encodings.c @@ -32,7 +32,7 @@ ENUM(encoding_type_names, U_INT_4, ENCRYPTED_DATA, "ATTRIBUTE_FORMAT", "ATTRIBUTE_TYPE", "ATTRIBUTE_LENGTH_OR_VALUE", - "CONFIGURATION_ATTRIBUTE_LENGTH", + "ATTRIBUTE_LENGTH", "ATTRIBUTE_VALUE", "TS_TYPE", "ADDRESS", -- cgit v1.2.3