diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2009-02-18 19:45:46 +0000 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2009-02-18 19:45:46 +0000 |
| commit | b250665f58c43c6532618ec5d9a964ce43d5738d (patch) | |
| tree | 8e006e2264af31d72cbff02298bcc1109db6c662 /src | |
| parent | b8fa437fb74ff57a3983356af85bc90ff24d1259 (diff) | |
| download | strongswan-b250665f58c43c6532618ec5d9a964ce43d5738d.tar.bz2 strongswan-b250665f58c43c6532618ec5d9a964ce43d5738d.tar.xz | |
adding enum elements for MD4 and DES (ECB)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/crypto/crypters/crypter.c | 4 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/crypters/crypter.h | 3 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/hashers/hasher.c | 5 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/hashers/hasher.h | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/libstrongswan/crypto/crypters/crypter.c b/src/libstrongswan/crypto/crypters/crypter.c index 879cf6049..9fcb3e31a 100644 --- a/src/libstrongswan/crypto/crypters/crypter.c +++ b/src/libstrongswan/crypto/crypters/crypter.c @@ -41,5 +41,7 @@ ENUM_NEXT(encryption_algorithm_names, ENCR_AES_GCM_ICV8, ENCR_AES_GCM_ICV16, ENC "AES_GCM_8", "AES_GCM_12", "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); diff --git a/src/libstrongswan/crypto/crypters/crypter.h b/src/libstrongswan/crypto/crypters/crypter.h index 345d7abe3..03678ad16 100644 --- a/src/libstrongswan/crypto/crypters/crypter.h +++ b/src/libstrongswan/crypto/crypters/crypter.h @@ -51,7 +51,8 @@ enum encryption_algorithm_t { ENCR_AES_CCM_ICV16 = 16, ENCR_AES_GCM_ICV8 = 18, ENCR_AES_GCM_ICV12 = 19, - ENCR_AES_GCM_ICV16 = 20 + ENCR_AES_GCM_ICV16 = 20, + ENCR_DES_ECB = 1024 }; /** diff --git a/src/libstrongswan/crypto/hashers/hasher.c b/src/libstrongswan/crypto/hashers/hasher.c index ce208a110..1afd2f6a0 100644 --- a/src/libstrongswan/crypto/hashers/hasher.c +++ b/src/libstrongswan/crypto/hashers/hasher.c @@ -21,7 +21,7 @@ #include <asn1/oid.h> -ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA512, +ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_MD4, "HASH_UNKNOWN", "HASH_PREFERRED", "HASH_MD2", @@ -29,7 +29,8 @@ ENUM(hash_algorithm_names, HASH_UNKNOWN, HASH_SHA512, "HASH_SHA1", "HASH_SHA256", "HASH_SHA384", - "HASH_SHA512" + "HASH_SHA512", + "HASH_MD4" ); /* diff --git a/src/libstrongswan/crypto/hashers/hasher.h b/src/libstrongswan/crypto/hashers/hasher.h index a374da059..271d8706e 100644 --- a/src/libstrongswan/crypto/hashers/hasher.h +++ b/src/libstrongswan/crypto/hashers/hasher.h @@ -44,9 +44,11 @@ enum hash_algorithm_t { HASH_SHA256 = 5, HASH_SHA384 = 6, HASH_SHA512 = 7, + HASH_MD4 = 8, }; #define HASH_SIZE_MD2 16 +#define HASH_SIZE_MD4 16 #define HASH_SIZE_MD5 16 #define HASH_SIZE_SHA1 20 #define HASH_SIZE_SHA256 32 |