Added private Camellia XCBC identifiers for PRFs and signers

diff --git a/src/libstrongswan/crypto/prfs/prf.c b/src/libstrongswan/crypto/prfs/prf.c
index 8681a5b97bf9f55769f6c08fd9e3bda782595b18..12e13ef579f0e30c58919fb390a714b38d3ae397 100644 (file)
--- a/src/libstrongswan/crypto/prfs/prf.c
+++ b/src/libstrongswan/crypto/prfs/prf.c
@@ -16,12 +16,13 @@
 
 #include "prf.h"
 
-ENUM_BEGIN(pseudo_random_function_names, PRF_UNDEFINED, PRF_KEYED_SHA1,
+ENUM_BEGIN(pseudo_random_function_names, PRF_UNDEFINED, PRF_CAMELLIA128_XCBC,
        "PRF_UNDEFINED",
        "PRF_FIPS_SHA1_160",
        "PRF_FIPS_DES",
-       "PRF_KEYED_SHA1");
-ENUM_NEXT(pseudo_random_function_names, PRF_HMAC_MD5, PRF_AES128_CMAC, PRF_KEYED_SHA1,
+       "PRF_KEYED_SHA1",
+       "PRF_CAMELLIA128_XCBC");
+ENUM_NEXT(pseudo_random_function_names, PRF_HMAC_MD5, PRF_AES128_CMAC, PRF_CAMELLIA128_XCBC,
        "PRF_HMAC_MD5",
        "PRF_HMAC_SHA1",
        "PRF_HMAC_TIGER",

diff --git a/src/libstrongswan/crypto/prfs/prf.h b/src/libstrongswan/crypto/prfs/prf.h
index 6e853444f4cee1088b1bfdae7da7da0cc0e55722..ad15205d3d5a1e3471377197b6c5d344dfe338cf 100644 (file)
--- a/src/libstrongswan/crypto/prfs/prf.h
+++ b/src/libstrongswan/crypto/prfs/prf.h
@@ -30,8 +30,7 @@ typedef struct prf_t prf_t;
 /**
  * Pseudo random function, as in IKEv2 RFC 3.3.2.
  *
- * PRF algorithms not defined in IKEv2 are allocated in "private use"
- * space.
+ * PRF algorithms not defined in IKEv2 are allocated in "private use" space.
  */
 enum pseudo_random_function_t {
        PRF_UNDEFINED = 1024,
@@ -55,11 +54,12 @@ enum pseudo_random_function_t {
        PRF_FIPS_SHA1_160 = 1025,
        /** FIPS 186-2-change1, uses fixed output size of 160bit */
        PRF_FIPS_DES = 1026,
-       /**
-        * Keyed hash algorithm using SHA1, used in EAP-AKA:
+       /** Keyed hash algorithm using SHA1, used in EAP-AKA:
         * This PRF uses SHA1, but XORs the key into the IV. No "Final()" operation
         * is applied to the SHA1 state. */
        PRF_KEYED_SHA1 = 1027,
+       /** draft-kanno-ipsecme-camellia-xcbc, not yet assigned by IANA */
+       PRF_CAMELLIA128_XCBC = 1028,
 };
 
 /**

diff --git a/src/libstrongswan/crypto/signers/signer.c b/src/libstrongswan/crypto/signers/signer.c
index 1c7dcaef0f8d83abb21033fcce1c4a5e667eeadd..f26896309c1ac5707f477e65b75784f5aa41a1d5 100644 (file)
--- a/src/libstrongswan/crypto/signers/signer.c
+++ b/src/libstrongswan/crypto/signers/signer.c
@@ -16,12 +16,13 @@
 
 #include "signer.h"
 
-ENUM_BEGIN(integrity_algorithm_names, AUTH_UNDEFINED, AUTH_HMAC_SHA2_256_256,
+ENUM_BEGIN(integrity_algorithm_names, AUTH_UNDEFINED, AUTH_CAMELLIA_XCBC_96,
        "UNDEFINED",
        "HMAC_SHA1_128",
        "HMAC_SHA2_256_96",
-       "HMAC_SHA2_256_256");
-ENUM_NEXT(integrity_algorithm_names, AUTH_HMAC_MD5_96, AUTH_HMAC_SHA2_512_256, AUTH_HMAC_SHA2_256_256,
+       "HMAC_SHA2_256_256",
+       "CAMELLIA_XCBC_96");
+ENUM_NEXT(integrity_algorithm_names, AUTH_HMAC_MD5_96, AUTH_HMAC_SHA2_512_256, AUTH_CAMELLIA_XCBC_96,
        "HMAC_MD5_96",
        "HMAC_SHA1_96",
        "DES_MAC",

diff --git a/src/libstrongswan/crypto/signers/signer.h b/src/libstrongswan/crypto/signers/signer.h
index 02efc1c5acc3e57df670e95a691cb905d729442a..17bd0f889e25d3fa051f8df3d85ae34d3e73ae81 100644 (file)
--- a/src/libstrongswan/crypto/signers/signer.h
+++ b/src/libstrongswan/crypto/signers/signer.h
@@ -68,6 +68,8 @@ enum integrity_algorithm_t {
        AUTH_HMAC_SHA2_256_96 = 1026,
        /** SHA256 full length tuncation variant, as used in TLS */
        AUTH_HMAC_SHA2_256_256 = 1027,
+       /** draft-kanno-ipsecme-camellia-xcbc, not yet assigned by IANA */
+       AUTH_CAMELLIA_XCBC_96 = 1028,
 };
 
 /**