diff options
| author | Michael Brown | 2012-03-09 16:45:56 +0100 |
|---|---|---|
| committer | Michael Brown | 2012-03-09 18:14:39 +0100 |
| commit | 1c29b4d979a9ea9be49bb942a2c41b7b6dc0dc9e (patch) | |
| tree | 0738704fea59e225361b051adfabdd3769320317 /src/crypto/axtls_aes.c | |
| parent | [ath9k] Fix compilation on older gcc versions (diff) | |
| download | ipxe-1c29b4d979a9ea9be49bb942a2c41b7b6dc0dc9e.tar.gz ipxe-1c29b4d979a9ea9be49bb942a2c41b7b6dc0dc9e.tar.xz ipxe-1c29b4d979a9ea9be49bb942a2c41b7b6dc0dc9e.zip | |
[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 <mcb30@ipxe.org>
Diffstat (limited to 'src/crypto/axtls_aes.c')
| -rw-r--r-- | src/crypto/axtls_aes.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 <string.h> #include <errno.h> +#include <assert.h> #include <byteswap.h> #include <ipxe/crypto.h> #include <ipxe/cbc.h> @@ -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 */ |