diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2008-04-02 18:51:10 +0000 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2008-04-02 18:51:10 +0000 |
| commit | 97da3d2de03fc866ddd0659aa7e7a6a268741f1a (patch) | |
| tree | aafbd7b1a56792f67163fd50fdd8cf1fb50ef90b /src | |
| parent | 7a9d3ae4719500e416261ba668c9b2dcc94569dc (diff) | |
| download | strongswan-97da3d2de03fc866ddd0659aa7e7a6a268741f1a.tar.bz2 strongswan-97da3d2de03fc866ddd0659aa7e7a6a268741f1a.tar.xz | |
renamed AES_cbc_encrypt to SS_AES_cbc_encrypt due to name collision with OpenSSL library
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcrypto/libaes/aes_cbc.c | 4 | ||||
| -rw-r--r-- | src/libcrypto/libaes/aes_cbc.h | 4 | ||||
| -rw-r--r-- | src/pluto/alg/ike_alg_aes.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libcrypto/libaes/aes_cbc.c b/src/libcrypto/libaes/aes_cbc.c index 962dd1a35..c406b1622 100644 --- a/src/libcrypto/libaes/aes_cbc.c +++ b/src/libcrypto/libaes/aes_cbc.c @@ -6,8 +6,8 @@ #include "aes_cbc.h" #include "cbc_generic.h" /* returns bool success */ -int AES_set_key(aes_context *aes_ctx, const u_int8_t *key, int keysize) { +int SS_AES_set_key(aes_context *aes_ctx, const u_int8_t *key, int keysize) { aes_set_key(aes_ctx, key, keysize, 0); return 1; } -CBC_IMPL_BLK16(AES_cbc_encrypt, aes_context, u_int8_t *, aes_encrypt, aes_decrypt); +CBC_IMPL_BLK16(SS_AES_cbc_encrypt, aes_context, u_int8_t *, aes_encrypt, aes_decrypt); diff --git a/src/libcrypto/libaes/aes_cbc.h b/src/libcrypto/libaes/aes_cbc.h index 92f5d77f5..65015da6e 100644 --- a/src/libcrypto/libaes/aes_cbc.h +++ b/src/libcrypto/libaes/aes_cbc.h @@ -1,4 +1,4 @@ /* Glue header */ #include "aes.h" -int AES_set_key(aes_context *aes_ctx, const u_int8_t * key, int keysize); -int AES_cbc_encrypt(aes_context *ctx, const u_int8_t * in, u_int8_t * out, int ilen, const u_int8_t * iv, int encrypt); +int SS_AES_set_key(aes_context *aes_ctx, const u_int8_t * key, int keysize); +int SS_AES_cbc_encrypt(aes_context *ctx, const u_int8_t * in, u_int8_t * out, int ilen, const u_int8_t * iv, int encrypt); diff --git a/src/pluto/alg/ike_alg_aes.c b/src/pluto/alg/ike_alg_aes.c index 44de09b4c..c635af723 100644 --- a/src/pluto/alg/ike_alg_aes.c +++ b/src/pluto/alg/ike_alg_aes.c @@ -34,7 +34,7 @@ do_aes(u_int8_t *buf, size_t buf_len, u_int8_t *key, size_t key_size, u_int8_t * memcpy(new_iv=iv_bak, (char*) buf + buf_len - AES_CBC_BLOCK_SIZE , AES_CBC_BLOCK_SIZE); - AES_cbc_encrypt(&aes_ctx, buf, buf, buf_len, iv, enc); + SS_AES_cbc_encrypt(&aes_ctx, buf, buf, buf_len, iv, enc); if (enc) new_iv = (char*) buf + buf_len-AES_CBC_BLOCK_SIZE; |