From 1c29b4d979a9ea9be49bb942a2c41b7b6dc0dc9e Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 9 Mar 2012 15:45:56 +0000 Subject: [crypto] Upgrade AES and RSA code to upstream axTLS version 1.4.5 All axTLS files are now vanilla versions of the upstream axTLS files, with one minor exception: the unused "ctx" parameter of bi_int_divide() has been marked with "__unused" to avoid a compilation error. Signed-off-by: Michael Brown --- src/crypto/axtls_aes.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/crypto/axtls_aes.c') diff --git a/src/crypto/axtls_aes.c b/src/crypto/axtls_aes.c index b73a57252..3f1d668a9 100644 --- a/src/crypto/axtls_aes.c +++ b/src/crypto/axtls_aes.c @@ -20,6 +20,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include #include +#include #include #include #include @@ -119,7 +120,7 @@ static void aes_encrypt ( void *ctx, const void *src, void *dst, assert ( len == AES_BLOCKSIZE ); if ( aes_ctx->decrypting ) assert ( 0 ); - aes_call_axtls ( &aes_ctx->axtls_ctx, src, dst, AES_encrypt ); + aes_call_axtls ( &aes_ctx->axtls_ctx, src, dst, axtls_aes_encrypt ); } /** @@ -139,7 +140,7 @@ static void aes_decrypt ( void *ctx, const void *src, void *dst, AES_convert_key ( &aes_ctx->axtls_ctx ); aes_ctx->decrypting = 1; } - aes_call_axtls ( &aes_ctx->axtls_ctx, src, dst, AES_decrypt ); + aes_call_axtls ( &aes_ctx->axtls_ctx, src, dst, axtls_aes_decrypt ); } /** Basic AES algorithm */ -- cgit v1.2.3-55-g7522