moved AUTH_HMAC_MD5_128 to IANA defined number

This commit is contained in:
Martin Willi
2009-04-02 13:53:20 +00:00
parent d4f8c569ab
commit 15e247922d
2 changed files with 6 additions and 5 deletions
+4 -3
View File
@@ -21,13 +21,14 @@
ENUM_BEGIN(integrity_algorithm_names, AUTH_UNDEFINED, AUTH_HMAC_SHA1_128, ENUM_BEGIN(integrity_algorithm_names, AUTH_UNDEFINED, AUTH_HMAC_SHA1_128,
"UNDEFINED", "UNDEFINED",
"AUTH_HMAC_SHA1_128"); "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_MD5_96",
"HMAC_SHA1_96", "HMAC_SHA1_96",
"DES_MAC", "DES_MAC",
"KPDK_MD5", "KPDK_MD5",
"AES_XCBC_96"); "AES_XCBC_96",
ENUM_NEXT(integrity_algorithm_names, AUTH_HMAC_SHA2_256_128, AUTH_HMAC_SHA2_512_256, AUTH_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_256_128",
"AUTH_HMAC_SHA2_384_192", "AUTH_HMAC_SHA2_384_192",
"AUTH_HMAC_SHA2_512_256"); "AUTH_HMAC_SHA2_512_256");
+2 -2
View File
@@ -43,6 +43,8 @@ enum integrity_algorithm_t {
AUTH_DES_MAC = 3, AUTH_DES_MAC = 3,
AUTH_KPDK_MD5 = 4, AUTH_KPDK_MD5 = 4,
AUTH_AES_XCBC_96 = 5, AUTH_AES_XCBC_96 = 5,
/** RFC4595, used for RADIUS */
AUTH_HMAC_MD5_128 = 6,
/** Implemented via hmac_signer_t */ /** Implemented via hmac_signer_t */
AUTH_HMAC_SHA2_256_128 = 12, AUTH_HMAC_SHA2_256_128 = 12,
/** Implemented via hmac_signer_t */ /** Implemented via hmac_signer_t */
@@ -51,8 +53,6 @@ enum integrity_algorithm_t {
AUTH_HMAC_SHA2_512_256 = 14, AUTH_HMAC_SHA2_512_256 = 14,
/** Implemented via hmac_signer_t */ /** Implemented via hmac_signer_t */
AUTH_HMAC_SHA1_128 = 1025, AUTH_HMAC_SHA1_128 = 1025,
/** Implemented via hmac_signer_t */
AUTH_HMAC_MD5_128 = 1026,
}; };
/** /**