diff options
| author | Martin Willi <martin@revosec.ch> | 2010-08-13 16:06:05 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2010-08-13 17:11:54 +0200 |
| commit | c7776e0aa804789cf33c4c491be4d31211efd910 (patch) | |
| tree | 9600bb9aa6bd71ff0601e847cfe473f8a7a7b512 /src | |
| parent | 5a2dbd5c37ab9bbe8293df5a9c90bb8a94f19f93 (diff) | |
| download | strongswan-c7776e0aa804789cf33c4c491be4d31211efd910.tar.bz2 strongswan-c7776e0aa804789cf33c4c491be4d31211efd910.tar.xz | |
Support Camellia XCBC algorithms in proposal
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcharon/config/proposal.c | 3 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/proposal/proposal_keywords.txt | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c index 2308ce774..e19ee974a 100644 --- a/src/libcharon/config/proposal.c +++ b/src/libcharon/config/proposal.c @@ -623,6 +623,9 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg) case AUTH_AES_XCBC_96: prf = PRF_AES128_XCBC; break; + case AUTH_CAMELLIA_XCBC_96: + prf = PRF_CAMELLIA128_XCBC; + break; default: prf = PRF_UNDEFINED; } diff --git a/src/libstrongswan/crypto/proposal/proposal_keywords.txt b/src/libstrongswan/crypto/proposal/proposal_keywords.txt index f5e45097a..ce765e4d1 100644 --- a/src/libstrongswan/crypto/proposal/proposal_keywords.txt +++ b/src/libstrongswan/crypto/proposal/proposal_keywords.txt @@ -110,6 +110,7 @@ sha512, INTEGRITY_ALGORITHM, AUTH_HMAC_SHA2_512_256, 0 sha2_512, INTEGRITY_ALGORITHM, AUTH_HMAC_SHA2_512_256, 0 md5, INTEGRITY_ALGORITHM, AUTH_HMAC_MD5_96, 0 aesxcbc, INTEGRITY_ALGORITHM, AUTH_AES_XCBC_96, 0 +camelliaxcbc, INTEGRITY_ALGORITHM, AUTH_CAMELLIA_XCBC_96, 0 modpnull, DIFFIE_HELLMAN_GROUP, MODP_NULL, 0 modp768, DIFFIE_HELLMAN_GROUP, MODP_768_BIT, 0 modp1024, DIFFIE_HELLMAN_GROUP, MODP_1024_BIT, 0 |