From 15e247922d02738035a22412edcca17915e1b30b Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 2 Apr 2009 13:53:20 +0000 Subject: [PATCH] moved AUTH_HMAC_MD5_128 to IANA defined number --- src/libstrongswan/crypto/signers/signer.c | 7 ++++--- src/libstrongswan/crypto/signers/signer.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libstrongswan/crypto/signers/signer.c b/src/libstrongswan/crypto/signers/signer.c index 377c2b921..8d362436b 100644 --- a/src/libstrongswan/crypto/signers/signer.c +++ b/src/libstrongswan/crypto/signers/signer.c @@ -21,13 +21,14 @@ 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_AES_XCBC_96, AUTH_HMAC_SHA1_128, +ENUM_NEXT(integrity_algorithm_names, AUTH_HMAC_MD5_96, AUTH_HMAC_MD5_128, AUTH_HMAC_SHA1_128, "HMAC_MD5_96", "HMAC_SHA1_96", "DES_MAC", "KPDK_MD5", - "AES_XCBC_96"); -ENUM_NEXT(integrity_algorithm_names, AUTH_HMAC_SHA2_256_128, AUTH_HMAC_SHA2_512_256, AUTH_AES_XCBC_96, + "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, "AUTH_HMAC_SHA2_256_128", "AUTH_HMAC_SHA2_384_192", "AUTH_HMAC_SHA2_512_256"); diff --git a/src/libstrongswan/crypto/signers/signer.h b/src/libstrongswan/crypto/signers/signer.h index 9bde09461..992cce6cf 100644 --- a/src/libstrongswan/crypto/signers/signer.h +++ b/src/libstrongswan/crypto/signers/signer.h @@ -43,6 +43,8 @@ enum integrity_algorithm_t { AUTH_DES_MAC = 3, AUTH_KPDK_MD5 = 4, AUTH_AES_XCBC_96 = 5, + /** RFC4595, used for RADIUS */ + AUTH_HMAC_MD5_128 = 6, /** Implemented via hmac_signer_t */ AUTH_HMAC_SHA2_256_128 = 12, /** Implemented via hmac_signer_t */ @@ -51,8 +53,6 @@ enum integrity_algorithm_t { AUTH_HMAC_SHA2_512_256 = 14, /** Implemented via hmac_signer_t */ AUTH_HMAC_SHA1_128 = 1025, - /** Implemented via hmac_signer_t */ - AUTH_HMAC_MD5_128 = 1026, }; /**