Support Camellia XCBC algorithms in proposal

diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c
index 2308ce774ae4e0dd496affa2f898891ff8806966..e19ee974a77340134d8fe741f6ad0a519bc12a84 100644 (file)
--- 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 f5e45097acce3397ed8354b50bdd1b38558715c5..ce765e4d1dd8d73b8f16c44e803bdf7aa03f34ca 100644 (file)
--- 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