mirror of
https://github.com/strongswan/strongswan.git
synced 2025-10-06 00:00:47 -04:00
added OAKLEY_CAMELLIA
This commit is contained in:
parent
dcf47581a8
commit
89699b7660
@ -804,11 +804,12 @@ static const char *const oakley_enc_name[] = {
|
||||
"OAKLEY_3DES_CBC",
|
||||
"OAKLEY_CAST_CBC",
|
||||
"OAKLEY_AES_CBC",
|
||||
"OAKLEY_CAMELLIA_CBC"
|
||||
};
|
||||
|
||||
#ifdef NO_EXTRA_IKE
|
||||
enum_names oakley_enc_names =
|
||||
{ OAKLEY_DES_CBC, OAKLEY_AES_CBC, oakley_enc_name, NULL };
|
||||
{ OAKLEY_DES_CBC, OAKLEY_CAMELLIA_CBC, oakley_enc_name, NULL };
|
||||
#else
|
||||
static const char *const oakley_enc_name_draft_aes_cbc_02[] = {
|
||||
"OAKLEY_MARS_CBC" /* 65001 */,
|
||||
@ -831,7 +832,7 @@ enum_names oakley_enc_names_draft_aes_cbc_02 =
|
||||
, &oakley_enc_names_ssh };
|
||||
|
||||
enum_names oakley_enc_names =
|
||||
{ OAKLEY_DES_CBC, OAKLEY_AES_CBC, oakley_enc_name
|
||||
{ OAKLEY_DES_CBC, OAKLEY_CAMELLIA_CBC, oakley_enc_name
|
||||
, &oakley_enc_names_draft_aes_cbc_02 };
|
||||
#endif
|
||||
|
||||
|
@ -1018,6 +1018,7 @@ extern enum_names oakley_enc_names;
|
||||
#define OAKLEY_3DES_CBC 5
|
||||
#define OAKLEY_CAST_CBC 6
|
||||
#define OAKLEY_AES_CBC 7
|
||||
#define OAKLEY_CAMELLIA_CBC 8
|
||||
|
||||
#define OAKLEY_MARS_CBC 65001
|
||||
#define OAKLEY_RC6_CBC 65002
|
||||
|
Loading…
x
Reference in New Issue
Block a user