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

renamed AES_cbc_encrypt to SS_AES_cbc_encrypt due to name collision with OpenSSL library

Browse Source
This commit is contained in:
Andreas Steffen
2008-04-02 18:51:10 +00:00
parent 7a9d3ae471
commit 97da3d2de0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcrypto/libaes/aes_cbc.c
+2 -2
View File
@@ -6,8 +6,8 @@
#include "aes_cbc.h" #include "aes_cbc.h"
#include "cbc_generic.h" #include "cbc_generic.h"
/* returns bool success */ /* 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); aes_set_key(aes_ctx, key, keysize, 0);
return 1; 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);
src/libcrypto/libaes/aes_cbc.h
+2 -2
View File
@@ -1,4 +1,4 @@
/* Glue header */ /* Glue header */
#include "aes.h" #include "aes.h"
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);
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_cbc_encrypt(aes_context *ctx, const u_int8_t * in, u_int8_t * out, int ilen, const u_int8_t * iv, int encrypt);
src/pluto/alg/ike_alg_aes.c
+1 -1
View File
@@ -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 memcpy(new_iv=iv_bak, (char*) buf + buf_len - AES_CBC_BLOCK_SIZE
, 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) if (enc)
new_iv = (char*) buf + buf_len-AES_CBC_BLOCK_SIZE; new_iv = (char*) buf + buf_len-AES_CBC_BLOCK_SIZE;