defined ENCR_TWOFISH and ENCR_SERPENT
This commit is contained in:
parent
e43b1e4a5b
commit
c42d1469e6
|
@ -16,9 +16,7 @@
|
||||||
|
|
||||||
#include "crypter.h"
|
#include "crypter.h"
|
||||||
|
|
||||||
ENUM_BEGIN(encryption_algorithm_names, ENCR_UNDEFINED, ENCR_UNDEFINED,
|
ENUM_BEGIN(encryption_algorithm_names, ENCR_DES_IV64, ENCR_DES_IV32,
|
||||||
"UNDEFINED");
|
|
||||||
ENUM_NEXT(encryption_algorithm_names, ENCR_DES_IV64, ENCR_DES_IV32, ENCR_UNDEFINED,
|
|
||||||
"DES_IV64",
|
"DES_IV64",
|
||||||
"DES",
|
"DES",
|
||||||
"3DES",
|
"3DES",
|
||||||
|
@ -46,7 +44,10 @@ ENUM_NEXT(encryption_algorithm_names, ENCR_CAMELLIA_CBC, ENCR_CAMELLIA_CCM_ICV16
|
||||||
"CAMELLIA_CCM_ICV8",
|
"CAMELLIA_CCM_ICV8",
|
||||||
"CAMELLIA_CCM_ICV12",
|
"CAMELLIA_CCM_ICV12",
|
||||||
"CAMELLIA_CCM_ICV16");
|
"CAMELLIA_CCM_ICV16");
|
||||||
ENUM_NEXT(encryption_algorithm_names, ENCR_DES_ECB, ENCR_DES_ECB, ENCR_CAMELLIA_CCM_ICV16,
|
ENUM_NEXT(encryption_algorithm_names, ENCR_UNDEFINED, ENCR_TWOFISH, ENCR_CAMELLIA_CCM_ICV16,
|
||||||
"DES_ECB");
|
"UNDEFINED",
|
||||||
ENUM_END(encryption_algorithm_names, ENCR_DES_ECB);
|
"DES_ECB",
|
||||||
|
"SERPENT",
|
||||||
|
"TWOFISH");
|
||||||
|
ENUM_END(encryption_algorithm_names, ENCR_TWOFISH);
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@ typedef struct crypter_t crypter_t;
|
||||||
* Encryption algorithm, as in IKEv2 RFC 3.3.2.
|
* Encryption algorithm, as in IKEv2 RFC 3.3.2.
|
||||||
*/
|
*/
|
||||||
enum encryption_algorithm_t {
|
enum encryption_algorithm_t {
|
||||||
ENCR_UNDEFINED = 1024,
|
|
||||||
ENCR_DES_IV64 = 1,
|
ENCR_DES_IV64 = 1,
|
||||||
ENCR_DES = 2,
|
ENCR_DES = 2,
|
||||||
ENCR_3DES = 3,
|
ENCR_3DES = 3,
|
||||||
|
@ -56,7 +55,10 @@ enum encryption_algorithm_t {
|
||||||
ENCR_CAMELLIA_CCM_ICV8 = 25,
|
ENCR_CAMELLIA_CCM_ICV8 = 25,
|
||||||
ENCR_CAMELLIA_CCM_ICV12 = 26,
|
ENCR_CAMELLIA_CCM_ICV12 = 26,
|
||||||
ENCR_CAMELLIA_CCM_ICV16 = 27,
|
ENCR_CAMELLIA_CCM_ICV16 = 27,
|
||||||
ENCR_DES_ECB = 1025
|
ENCR_UNDEFINED = 1024,
|
||||||
|
ENCR_DES_ECB = 1025,
|
||||||
|
ENCR_SERPENT = 1026,
|
||||||
|
ENCR_TWOFISH = 1027
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue