denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated list of ESP and AH algorithms

Browse Source
This commit is contained in:
Andreas Steffen
2008-04-18 11:25:37 +00:00
parent 6439267a8c
commit be2e5b48cd
3 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libfreeswan/ipsec_policy.h
+9 -1
View File
@@ -82,7 +82,9 @@ enum ipsec_authentication_algo {
AH_SHA2_256 = 5, AH_SHA2_256 = 5,
AH_SHA2_384 = 6, AH_SHA2_384 = 6,
AH_SHA2_512 = 7, AH_SHA2_512 = 7,
AH_RIPEMD = 8 AH_RIPEMD = 8,
AH_AES_XCBC_MAC = 9,
AH_RSA = 10
}; };
/* IPsec ESP transform values /* IPsec ESP transform values
@@ -108,6 +110,12 @@ enum ipsec_cipher_algo {
ESP_AES_CCM_8 = 14, ESP_AES_CCM_8 = 14,
ESP_AES_CCM_12 = 15, ESP_AES_CCM_12 = 15,
ESP_AES_CCM_16 = 16, ESP_AES_CCM_16 = 16,
ESP_UNASSIGNED_17 = 17,
ESP_AES_GCM_8 = 18,
ESP_AES_GCM_12 = 19,
ESP_AES_GCM_16 = 20,
ESP_SEED_CBC = 21,
ESP_CAMELLIA = 22,
ESP_SERPENT = 252, ESP_SERPENT = 252,
ESP_TWOFISH = 253 ESP_TWOFISH = 253
}; };
src/pluto/constants.c
+15 -5
View File
@@ -377,11 +377,13 @@ static const char *const ah_transform_name[] = {
"AH_SHA2_256", "AH_SHA2_256",
"AH_SHA2_384", "AH_SHA2_384",
"AH_SHA2_512", "AH_SHA2_512",
"AH_RIPEMD" "AH_RIPEMD",
"AH_AES_XCBC_MAC",
"AH_RSA"
}; };
enum_names ah_transformid_names = enum_names ah_transformid_names =
{ AH_MD5, AH_RIPEMD, ah_transform_name, NULL }; { AH_MD5, AH_RSA, ah_transform_name, NULL };
/* IPsec ESP transform values */ /* IPsec ESP transform values */
@@ -401,7 +403,13 @@ static const char *const esp_transform_name[] = {
"ESP_AES-CTR", "ESP_AES-CTR",
"ESP_AES-CCM_8", "ESP_AES-CCM_8",
"ESP_AES-CCM_12", "ESP_AES-CCM_12",
"ESP_AES-CCM_16" "ESP_AES-CCM_16",
"ESP_UNASSIGNED_17",
"ESP_AES_GCM_8",
"ESP_AES_GCM_12",
"ESP_AES_GCM_16",
"ESP_SEED_CBC",
"ESP_CAMELLIA"
}; };
/* /*
@@ -417,7 +425,7 @@ enum_names esp_transformid_names_high =
{ ESP_SERPENT, ESP_TWOFISH, esp_transform_name_high, NULL }; { ESP_SERPENT, ESP_TWOFISH, esp_transform_name_high, NULL };
enum_names esp_transformid_names = enum_names esp_transformid_names =
{ ESP_DES_IV64, ESP_AES_CCM_16, esp_transform_name, &esp_transformid_names_high }; { ESP_DES_IV64, ESP_CAMELLIA, esp_transform_name, &esp_transformid_names_high };
/* IPCOMP transform values */ /* IPCOMP transform values */
@@ -684,6 +692,8 @@ static const char *const auth_alg_name[] = {
"AUTH_ALGORITHM_HMAC_SHA2_384", "AUTH_ALGORITHM_HMAC_SHA2_384",
"AUTH_ALGORITHM_HMAC_SHA2_512", "AUTH_ALGORITHM_HMAC_SHA2_512",
"AUTH_ALGORITHM_HMAC_RIPEMD", "AUTH_ALGORITHM_HMAC_RIPEMD",
"AUTH_ALGORITHM_AES_XCBC_MAC",
"AUTH_ALGORITHM_SIG_RSA"
}; };
static const char *const extended_auth_alg_name[] = { static const char *const extended_auth_alg_name[] = {
@@ -694,7 +704,7 @@ enum_names extended_auth_alg_names =
{ AUTH_ALGORITHM_NULL, AUTH_ALGORITHM_NULL, extended_auth_alg_name, NULL }; { AUTH_ALGORITHM_NULL, AUTH_ALGORITHM_NULL, extended_auth_alg_name, NULL };
enum_names auth_alg_names = enum_names auth_alg_names =
{ AUTH_ALGORITHM_HMAC_MD5, AUTH_ALGORITHM_HMAC_RIPEMD, auth_alg_name { AUTH_ALGORITHM_HMAC_MD5, AUTH_ALGORITHM_SIG_RSA, auth_alg_name
, &extended_auth_alg_names }; , &extended_auth_alg_names };
/* From draft-beaulieu-ike-xauth */ /* From draft-beaulieu-ike-xauth */
src/pluto/constants.h
+2
View File
@@ -992,6 +992,8 @@ extern enum_names auth_alg_names, extended_auth_alg_names;
#define AUTH_ALGORITHM_HMAC_SHA2_384 6 #define AUTH_ALGORITHM_HMAC_SHA2_384 6
#define AUTH_ALGORITHM_HMAC_SHA2_512 7 #define AUTH_ALGORITHM_HMAC_SHA2_512 7
#define AUTH_ALGORITHM_HMAC_RIPEMD 8 #define AUTH_ALGORITHM_HMAC_RIPEMD 8
#define AUTH_ALGORITHM_AES_XCBC_MAC 9
#define AUTH_ALGORITHM_SIG_RSA 10
#define AUTH_ALGORITHM_NULL 251 #define AUTH_ALGORITHM_NULL 251
/* Oakley Lifetime Type attribute /* Oakley Lifetime Type attribute