diff options
| author | Martin Willi <martin@strongswan.org> | 2008-05-08 12:43:27 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2008-05-08 12:43:27 +0000 |
| commit | 240e727fde37cd4062002bc9c7b981fc7fe173c3 (patch) | |
| tree | 4770e55b51dce817bec66465767c89734dc87fb9 /src | |
| parent | 5b7ec6d4e0878ac7cc5c19c31a37d5834936e0a2 (diff) | |
| download | strongswan-240e727fde37cd4062002bc9c7b981fc7fe173c3.tar.bz2 strongswan-240e727fde37cd4062002bc9c7b981fc7fe173c3.tar.xz | |
renamed PRF_AES128_CBC to PRF_AES128_XCBC
Diffstat (limited to 'src')
| -rw-r--r-- | src/charon/config/proposal.c | 4 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/prfs/prf.h | 2 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/xcbc/xcbc_plugin.c | 2 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/xcbc/xcbc_prf.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/charon/config/proposal.c b/src/charon/config/proposal.c index 99be9db6c..53f58f243 100644 --- 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 135d7889f..b412ed588 100644 --- 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 bb2801fde..f1501476f 100644 --- 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 0c480c455..03056594d 100644 --- 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: |