denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed PRF_AES128_CBC to PRF_AES128_XCBC

Browse Source
This commit is contained in:
Martin Willi
2008-05-08 12:43:27 +00:00
parent 5b7ec6d4e0
commit 240e727fde
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/config/proposal.c
+2 -2
View File
@@ -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); add_algorithm(this, INTEGRITY_ALGORITHM, AUTH_AES_XCBC_96, 0);
if (this->protocol == PROTO_IKE) 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) 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_MD5_96, 0);
add_algorithm(this, INTEGRITY_ALGORITHM, AUTH_HMAC_SHA2_384_192, 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, 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_SHA2_256, 0);
add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_SHA1, 0); add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_SHA1, 0);
add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_MD5, 0); add_algorithm(this, PSEUDO_RANDOM_FUNCTION, PRF_HMAC_MD5, 0);
src/libstrongswan/crypto/prfs/prf.h
+1 -1
View File
@@ -42,7 +42,7 @@ enum pseudo_random_function_t {
/** Implemented via hmac_prf_t. */ /** Implemented via hmac_prf_t. */
PRF_HMAC_SHA1 = 2, PRF_HMAC_SHA1 = 2,
PRF_HMAC_TIGER = 3, PRF_HMAC_TIGER = 3,
PRF_AES128_CBC = 4, PRF_AES128_XCBC = 4,
/** Implemented via hmac_prf_t. */ /** Implemented via hmac_prf_t. */
PRF_HMAC_SHA2_256 = 5, PRF_HMAC_SHA2_256 = 5,
/** Implemented via hmac_prf_t. */ /** Implemented via hmac_prf_t. */
src/libstrongswan/plugins/xcbc/xcbc_plugin.c
+1 -1
View File
@@ -55,7 +55,7 @@ plugin_t *plugin_create()
this->public.plugin.destroy = (void(*)(plugin_t*))destroy; 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); (prf_constructor_t)xcbc_prf_create);
lib->crypto->add_signer(lib->crypto, AUTH_AES_XCBC_96, lib->crypto->add_signer(lib->crypto, AUTH_AES_XCBC_96,
(signer_constructor_t)xcbc_signer_create); (signer_constructor_t)xcbc_signer_create);
src/libstrongswan/plugins/xcbc/xcbc_prf.c
+1 -1
View File
@@ -105,7 +105,7 @@ xcbc_prf_t *xcbc_prf_create(pseudo_random_function_t algo)
switch (algo) switch (algo)
{ {
case PRF_AES128_CBC: case PRF_AES128_XCBC:
xcbc = xcbc_create(ENCR_AES_CBC, 16); xcbc = xcbc_create(ENCR_AES_CBC, 16);
break; break;
default: default: