denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make AES-CMAC actually usable for IKEv2.

Browse Source
This commit is contained in:
Tobias Brunner
2012-04-04 10:51:46 +02:00
parent 4670661d6d
commit bad192069f
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/config/proposal.c
+5
View File
@@ -598,6 +598,9 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
case AUTH_CAMELLIA_XCBC_96: case AUTH_CAMELLIA_XCBC_96:
prf = PRF_CAMELLIA128_XCBC; prf = PRF_CAMELLIA128_XCBC;
break; break;
case AUTH_AES_CMAC_96:
prf = PRF_AES128_CMAC;
break;
default: default:
prf = PRF_UNDEFINED; prf = PRF_UNDEFINED;
} }
@@ -794,6 +797,7 @@ static void proposal_add_supported_ike(private_proposal_t *this)
case AUTH_HMAC_SHA2_512_256: case AUTH_HMAC_SHA2_512_256:
case AUTH_HMAC_MD5_96: case AUTH_HMAC_MD5_96:
case AUTH_AES_XCBC_96: case AUTH_AES_XCBC_96:
case AUTH_AES_CMAC_96:
add_algorithm(this, INTEGRITY_ALGORITHM, integrity, 0); add_algorithm(this, INTEGRITY_ALGORITHM, integrity, 0);
break; break;
default: default:
@@ -813,6 +817,7 @@ static void proposal_add_supported_ike(private_proposal_t *this)
case PRF_HMAC_SHA2_512: case PRF_HMAC_SHA2_512:
case PRF_HMAC_MD5: case PRF_HMAC_MD5:
case PRF_AES128_XCBC: case PRF_AES128_XCBC:
case PRF_AES128_CMAC:
add_algorithm(this, PSEUDO_RANDOM_FUNCTION, prf, 0); add_algorithm(this, PSEUDO_RANDOM_FUNCTION, prf, 0);
break; break;
default: default:
src/libstrongswan/crypto/proposal/proposal_keywords.txt
+1
View File
@@ -131,6 +131,7 @@ md5, INTEGRITY_ALGORITHM, AUTH_HMAC_MD5_96, 0
md5_128, INTEGRITY_ALGORITHM, AUTH_HMAC_MD5_128, 0 md5_128, INTEGRITY_ALGORITHM, AUTH_HMAC_MD5_128, 0
aesxcbc, INTEGRITY_ALGORITHM, AUTH_AES_XCBC_96, 0 aesxcbc, INTEGRITY_ALGORITHM, AUTH_AES_XCBC_96, 0
camelliaxcbc, INTEGRITY_ALGORITHM, AUTH_CAMELLIA_XCBC_96, 0 camelliaxcbc, INTEGRITY_ALGORITHM, AUTH_CAMELLIA_XCBC_96, 0
aescmac, INTEGRITY_ALGORITHM, AUTH_AES_CMAC_96, 0
modpnull, DIFFIE_HELLMAN_GROUP, MODP_NULL, 0 modpnull, DIFFIE_HELLMAN_GROUP, MODP_NULL, 0
modp768, DIFFIE_HELLMAN_GROUP, MODP_768_BIT, 0 modp768, DIFFIE_HELLMAN_GROUP, MODP_768_BIT, 0
modp1024, DIFFIE_HELLMAN_GROUP, MODP_1024_BIT, 0 modp1024, DIFFIE_HELLMAN_GROUP, MODP_1024_BIT, 0