added support for AUTH_HMAC_SHA1_160

This commit is contained in:
Andreas Steffen 2009-05-04 23:01:40 +02:00
parent cae1ded1dc
commit 8c45f0f102
3 changed files with 11 additions and 4 deletions

View File

@ -19,14 +19,15 @@
ENUM_BEGIN(integrity_algorithm_names, AUTH_UNDEFINED, AUTH_HMAC_SHA1_128,
"UNDEFINED",
"AUTH_HMAC_SHA1_128");
ENUM_NEXT(integrity_algorithm_names, AUTH_HMAC_MD5_96, AUTH_HMAC_MD5_128, AUTH_HMAC_SHA1_128,
ENUM_NEXT(integrity_algorithm_names, AUTH_HMAC_MD5_96, AUTH_HMAC_SHA1_160, AUTH_HMAC_SHA1_128,
"HMAC_MD5_96",
"HMAC_SHA1_96",
"DES_MAC",
"KPDK_MD5",
"AES_XCBC_96",
"HMAC_MD5_128");
ENUM_NEXT(integrity_algorithm_names, AUTH_HMAC_SHA2_256_128, AUTH_HMAC_SHA2_512_256, AUTH_HMAC_MD5_128,
"HMAC_MD5_128",
"HMAC_SHA1_160");
ENUM_NEXT(integrity_algorithm_names, AUTH_HMAC_SHA2_256_128, AUTH_HMAC_SHA2_512_256, AUTH_HMAC_SHA1_160,
"AUTH_HMAC_SHA2_256_128",
"AUTH_HMAC_SHA2_384_192",
"AUTH_HMAC_SHA2_512_256");

View File

@ -41,8 +41,10 @@ enum integrity_algorithm_t {
AUTH_DES_MAC = 3,
AUTH_KPDK_MD5 = 4,
AUTH_AES_XCBC_96 = 5,
/** RFC4595, used for RADIUS */
/** RFC4595, used for IKEv1 or RADIUS */
AUTH_HMAC_MD5_128 = 6,
/** RFC4595, used for IKEv1 */
AUTH_HMAC_SHA1_160 = 7,
/** Implemented via hmac_signer_t */
AUTH_HMAC_SHA2_256_128 = 12,
/** Implemented via hmac_signer_t */

View File

@ -153,6 +153,10 @@ hmac_signer_t *hmac_signer_create(integrity_algorithm_t algo)
hash = HASH_SHA1;
trunc = 16;
break;
case AUTH_HMAC_SHA1_160:
hash = HASH_SHA1;
trunc = 20;
break;
case AUTH_HMAC_MD5_96:
hash = HASH_MD5;
trunc = 12;