- moved algorithm definitions from payloads to corresponding transforms

- cleanup of docs in transforms

2 files changed, 4 insertions, 147 deletions

diff --git a/Source/charon/encoding/payloads/transform_substructure.c b/Source/charon/encoding/payloads/transform_substructure.c
index e81aae57e..586ce2867 100644
--- a/Source/charon/encoding/payloads/transform_substructure.c
+++ b/Source/charon/encoding/payloads/transform_substructure.c
@@ -99,67 +99,6 @@ mapping_t transform_type_m[] = {
 
 
 /** 
- * string mappings for encryption_algorithm_t
- */
-mapping_t encryption_algorithm_m[] = {
-	{ENCR_UNDEFINED, "ENCR_UNDEFINED"},
-	{ENCR_DES_IV64, "ENCR_DES_IV64"},
-	{ENCR_DES, "ENCR_DES"},
-	{ENCR_3DES, "ENCR_3DES"},
-	{ENCR_RC5, "ENCR_RC5"},
-	{ENCR_IDEA, "ENCR_IDEA"},
-	{ENCR_CAST, "ENCR_CAST"},
-	{ENCR_BLOWFISH, "ENCR_BLOWFISH"},
-	{ENCR_3IDEA, "ENCR_3IDEA"},
-	{ENCR_DES_IV32, "ENCR_DES_IV32"},
-	{ENCR_NULL, "ENCR_NULL"},
-	{ENCR_AES_CBC, "ENCR_AES_CBC"},
-	{ENCR_AES_CTR, "ENCR_AES_CTR"},
-	{MAPPING_END, NULL}
-};
-
-/** 
- * string mappings for encryption_algorithm_t
- */
-mapping_t pseudo_random_function_m[] = {
-	{PRF_UNDEFINED, "PRF_UNDEFINED"},
-	{PRF_HMAC_MD5, "PRF_HMAC_MD5"},
-	{PRF_HMAC_SHA1, "PRF_HMAC_SHA1"},
-	{PRF_HMAC_TIGER, "PRF_HMAC_TIGER"},
-	{PRF_AES128_CBC, "PRF_AES128_CBC"},
-	{MAPPING_END, NULL}
-};
-
-/** 
- * string mappings for integrity_algorithm_t
- */
-mapping_t integrity_algorithm_m[] = {
-	{AUTH_UNDEFINED, "AUTH_UNDEFINED"},
-	{AUTH_HMAC_MD5_96, "AUTH_HMAC_MD5_96"},
-	{AUTH_HMAC_SHA1_96, "AUTH_HMAC_SHA1_96"},
-	{AUTH_DES_MAC, "AUTH_DES_MAC"},
-	{AUTH_KPDK_MD5, "AUTH_KPDK_MD5"},
-	{AUTH_AES_XCBC_96, "AUTH_AES_XCBC_96"},
-	{MAPPING_END, NULL}
-};
-
-/** 
- * string mappings for diffie_hellman_group_t
- */
-mapping_t diffie_hellman_group_m[] = {
-	{MODP_UNDEFINED, "MODP_UNDEFINED"},
-	{MODP_768_BIT, "MODP_768_BIT"},
-	{MODP_1024_BIT, "MODP_1024_BIT"},
-	{MODP_1536_BIT, "MODP_1536_BIT"},
-	{MODP_2048_BIT, "MODP_2048_BIT"},
-	{MODP_3072_BIT, "MODP_3072_BIT"},
-	{MODP_4096_BIT, "MODP_4096_BIT"},
-	{MODP_6144_BIT, "MODP_6144_BIT"},
-	{MODP_8192_BIT, "MODP_8192_BIT"},
-	{MAPPING_END, NULL}
-};
-
-/** 
  * string mappings for extended_sequence_numbers_t
  */
 mapping_t extended_sequence_numbers_m[] = {
diff --git a/Source/charon/encoding/payloads/transform_substructure.h b/Source/charon/encoding/payloads/transform_substructure.h
index e4b503ab9..8d49874db 100644
--- a/Source/charon/encoding/payloads/transform_substructure.h
+++ b/Source/charon/encoding/payloads/transform_substructure.h
@@ -30,6 +30,10 @@
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/transform_attribute.h>
 #include <utils/linked_list.h>
+#include <transforms/diffie_hellman.h>
+#include <transforms/signers/signer.h>
+#include <transforms/prfs/prf.h>
+#include <transforms/crypters/crypter.h>
 
 
 /**
@@ -62,92 +66,6 @@ enum transform_type_t {
  */
 extern mapping_t transform_type_m[];
 
-typedef enum encryption_algorithm_t encryption_algorithm_t;
-
-/**
- * Encryption algorithm, as in IKEv2 draft 3.3.2
- */
-enum encryption_algorithm_t {
-	ENCR_UNDEFINED = 1024,
-	ENCR_DES_IV64 = 1,
-	ENCR_DES = 2,
-	ENCR_3DES = 3,
-	ENCR_RC5 = 4,
-	ENCR_IDEA = 5,
-	ENCR_CAST = 6,
-	ENCR_BLOWFISH = 7,
-	ENCR_3IDEA = 8,
-	ENCR_DES_IV32 = 9,
-	RESERVED = 10,
-	ENCR_NULL = 11,
-	ENCR_AES_CBC = 12,
-	ENCR_AES_CTR = 13
-};
-
-/** 
- * string mappings for encryption_algorithm_t
- */
-extern mapping_t encryption_algorithm_m[];
-
-typedef enum pseudo_random_function_t pseudo_random_function_t;
-
-/**
- * Pseudo random function, as in IKEv2 draft 3.3.2
- */
-enum pseudo_random_function_t {
-	PRF_UNDEFINED = 1024,
-	PRF_HMAC_MD5 = 1,
-	PRF_HMAC_SHA1 = 2,
-	PRF_HMAC_TIGER = 3,
-	PRF_AES128_CBC = 4
-};
-
-/** 
- * string mappings for encryption_algorithm_t
- */
-extern mapping_t pseudo_random_function_m[];
-
-typedef enum integrity_algorithm_t integrity_algorithm_t;
-
-/**
- * Integrity algorithm, as in IKEv2 draft 3.3.2
- */
-enum integrity_algorithm_t {
-	AUTH_UNDEFINED = 1024,
-	AUTH_HMAC_MD5_96 = 1,
-	AUTH_HMAC_SHA1_96 = 2,
-	AUTH_DES_MAC = 3,
-	AUTH_KPDK_MD5 = 4,
-	AUTH_AES_XCBC_96 = 5
-};
-
-/** 
- * string mappings for integrity_algorithm_t
- */
-extern mapping_t integrity_algorithm_m[];
-
-
-typedef enum diffie_hellman_group_t diffie_hellman_group_t;
-
-/** 
- * Diffie-Hellman group, as in IKEv2 draft 3.3.2 and RFC 3526
- */
-enum diffie_hellman_group_t {
-	MODP_UNDEFINED = 1024,
-	MODP_768_BIT = 1,
-	MODP_1024_BIT = 2,
-	MODP_1536_BIT = 5,
-	MODP_2048_BIT = 14,
-	MODP_3072_BIT = 15,
-	MODP_4096_BIT = 16,
-	MODP_6144_BIT = 17,
-	MODP_8192_BIT = 18
-};
-
-/** 
- * string mappings for diffie_hellman_group_t
- */
-extern mapping_t diffie_hellman_group_m[];
 
 typedef enum extended_sequence_numbers_t extended_sequence_numbers_t;