Support Camellia XCBC algorithms in proposal
authorMartin Willi <martin@revosec.ch>
Fri, 13 Aug 2010 14:06:05 +0000 (16:06 +0200)
committerMartin Willi <martin@revosec.ch>
Fri, 13 Aug 2010 15:11:54 +0000 (17:11 +0200)
src/libcharon/config/proposal.c
src/libstrongswan/crypto/proposal/proposal_keywords.txt

index 2308ce7..e19ee97 100644 (file)
@@ -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;
                }
index f5e4509..ce765e4 100644 (file)
@@ -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