adding enum elements for MD4 and DES (ECB)

This commit is contained in:
Tobias Brunner
2009-02-18 19:45:46 +00:00
parent b8fa437fb7
commit b250665f58
4 changed files with 10 additions and 4 deletions
+3 -1
View File
@@ -41,5 +41,7 @@ ENUM_NEXT(encryption_algorithm_names, ENCR_AES_GCM_ICV8, ENCR_AES_GCM_ICV16, ENC
"AES_GCM_8", "AES_GCM_8",
"AES_GCM_12", "AES_GCM_12",
"AES_GCM_16"); "AES_GCM_16");
ENUM_END(encryption_algorithm_names, ENCR_AES_GCM_ICV16); ENUM_NEXT(encryption_algorithm_names, ENCR_DES_ECB, ENCR_DES_ECB, ENCR_AES_GCM_ICV16,
"DES_ECB");
ENUM_END(encryption_algorithm_names, ENCR_DES_ECB);
+2 -1
View File
@@ -51,7 +51,8 @@ enum encryption_algorithm_t {
ENCR_AES_CCM_ICV16 = 16, ENCR_AES_CCM_ICV16 = 16,
ENCR_AES_GCM_ICV8 = 18, ENCR_AES_GCM_ICV8 = 18,
ENCR_AES_GCM_ICV12 = 19, ENCR_AES_GCM_ICV12 = 19,
ENCR_AES_GCM_ICV16 = 20 ENCR_AES_GCM_ICV16 = 20,
ENCR_DES_ECB = 1024
}; };
/** /**
+3 -2
View File
@@ -21,7 +21,7 @@
#include <asn1/oid.h> #include <asn1/oid.h>
ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA512, ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_MD4,
"HASH_UNKNOWN", "HASH_UNKNOWN",
"HASH_PREFERRED", "HASH_PREFERRED",
"HASH_MD2", "HASH_MD2",
@@ -29,7 +29,8 @@ ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA512,
"HASH_SHA1", "HASH_SHA1",
"HASH_SHA256", "HASH_SHA256",
"HASH_SHA384", "HASH_SHA384",
"HASH_SHA512" "HASH_SHA512",
"HASH_MD4"
); );
/* /*
@@ -44,9 +44,11 @@ enum hash_algorithm_t {
HASH_SHA256 = 5, HASH_SHA256 = 5,
HASH_SHA384 = 6, HASH_SHA384 = 6,
HASH_SHA512 = 7, HASH_SHA512 = 7,
HASH_MD4 = 8,
}; };
#define HASH_SIZE_MD2 16 #define HASH_SIZE_MD2 16
#define HASH_SIZE_MD4 16
#define HASH_SIZE_MD5 16 #define HASH_SIZE_MD5 16
#define HASH_SIZE_SHA1 20 #define HASH_SIZE_SHA1 20
#define HASH_SIZE_SHA256 32 #define HASH_SIZE_SHA256 32