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/pluto/alg/ike_alg_aes.c | |
| 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/pluto/alg/ike_alg_aes.c')
| -rw-r--r-- | src/pluto/alg/ike_alg_aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |