renamed PRF_AES128_CBC to PRF_AES128_XCBC

diff --git a/src/charon/config/proposal.c b/src/charon/config/proposal.c
index 99be9db..53f58f2 100644 (file)
--- a/src/charon/config/proposal.c
+++ b/src/charon/config/proposal.c
@@ -607,7 +607,7 @@ static status_t add_string_algo(private_proposal_t *this, chunk_t alg)
                add_algorithm(this, INTEGRITY_ALGORITHM, AUTH_AES_XCBC_96, 0);
                if (this->protocol == PROTO_IKE)
                {
-                       add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_AES128_CBC, 0);
+                       add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_AES128_XCBC, 0);
                }
        }
        else if (strncmp(alg.ptr, "modp768", alg.len) == 0)
@@ -706,7 +706,7 @@ proposal_t *proposal_create_default(protocol_id_t protocol)
                        add_algorithm(this, INTEGRITY_ALGORITHM,    AUTH_HMAC_MD5_96,       0);
                        add_algorithm(this, INTEGRITY_ALGORITHM,    AUTH_HMAC_SHA2_384_192,     0);
                        add_algorithm(this, INTEGRITY_ALGORITHM,    AUTH_HMAC_SHA2_512_256,     0);
-                       add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_AES128_CBC,         0);
+                       add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_AES128_XCBC,        0);
                        add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_SHA2_256,      0);
                        add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_SHA1,          0);
                        add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_MD5,           0);

diff --git a/src/libstrongswan/crypto/prfs/prf.h b/src/libstrongswan/crypto/prfs/prf.h
index 135d788..b412ed5 100644 (file)
--- a/src/libstrongswan/crypto/prfs/prf.h
+++ b/src/libstrongswan/crypto/prfs/prf.h
@@ -42,7 +42,7 @@ enum pseudo_random_function_t {
        /** Implemented via hmac_prf_t. */
        PRF_HMAC_SHA1 = 2,
        PRF_HMAC_TIGER = 3,
-       PRF_AES128_CBC = 4,
+       PRF_AES128_XCBC = 4,
        /** Implemented via hmac_prf_t. */
        PRF_HMAC_SHA2_256 = 5,
        /** Implemented via hmac_prf_t. */

diff --git a/src/libstrongswan/plugins/xcbc/xcbc_plugin.c b/src/libstrongswan/plugins/xcbc/xcbc_plugin.c
index bb2801f..f150147 100644 (file)
--- a/src/libstrongswan/plugins/xcbc/xcbc_plugin.c
+++ b/src/libstrongswan/plugins/xcbc/xcbc_plugin.c
@@ -55,7 +55,7 @@ plugin_t *plugin_create()
        
        this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
        
-       lib->crypto->add_prf(lib->crypto, PRF_AES128_CBC, 
+       lib->crypto->add_prf(lib->crypto, PRF_AES128_XCBC, 
                                                 (prf_constructor_t)xcbc_prf_create);
        lib->crypto->add_signer(lib->crypto, AUTH_AES_XCBC_96, 
                                                        (signer_constructor_t)xcbc_signer_create);

diff --git a/src/libstrongswan/plugins/xcbc/xcbc_prf.c b/src/libstrongswan/plugins/xcbc/xcbc_prf.c
index 0c480c4..0305659 100644 (file)
--- a/src/libstrongswan/plugins/xcbc/xcbc_prf.c
+++ b/src/libstrongswan/plugins/xcbc/xcbc_prf.c
@@ -105,7 +105,7 @@ xcbc_prf_t *xcbc_prf_create(pseudo_random_function_t algo)
        
        switch (algo)
        {
-               case PRF_AES128_CBC:
+               case PRF_AES128_XCBC:
                        xcbc = xcbc_create(ENCR_AES_CBC, 16);
                        break;
                default: