aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/crypto/aes.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/crypto/aes.c')
-rw-r--r--arch/i386/crypto/aes.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/i386/crypto/aes.c b/arch/i386/crypto/aes.c
index a50397b1d5c7..a0e033510a3b 100644
--- a/arch/i386/crypto/aes.c
+++ b/arch/i386/crypto/aes.c
@@ -45,8 +45,8 @@
45#include <linux/crypto.h> 45#include <linux/crypto.h>
46#include <linux/linkage.h> 46#include <linux/linkage.h>
47 47
48asmlinkage void aes_enc_blk(const u8 *src, u8 *dst, void *ctx); 48asmlinkage void aes_enc_blk(void *ctx, u8 *dst, const u8 *src);
49asmlinkage void aes_dec_blk(const u8 *src, u8 *dst, void *ctx); 49asmlinkage void aes_dec_blk(void *ctx, u8 *dst, const u8 *src);
50 50
51#define AES_MIN_KEY_SIZE 16 51#define AES_MIN_KEY_SIZE 16
52#define AES_MAX_KEY_SIZE 32 52#define AES_MAX_KEY_SIZE 32
@@ -464,16 +464,6 @@ aes_set_key(void *ctx_arg, const u8 *in_key, unsigned int key_len, u32 *flags)
464 return 0; 464 return 0;
465} 465}
466 466
467static inline void aes_encrypt(void *ctx, u8 *dst, const u8 *src)
468{
469 aes_enc_blk(src, dst, ctx);
470}
471static inline void aes_decrypt(void *ctx, u8 *dst, const u8 *src)
472{
473 aes_dec_blk(src, dst, ctx);
474}
475
476
477static struct crypto_alg aes_alg = { 467static struct crypto_alg aes_alg = {
478 .cra_name = "aes", 468 .cra_name = "aes",
479 .cra_driver_name = "aes-i586", 469 .cra_driver_name = "aes-i586",
@@ -488,8 +478,8 @@ static struct crypto_alg aes_alg = {
488 .cia_min_keysize = AES_MIN_KEY_SIZE, 478 .cia_min_keysize = AES_MIN_KEY_SIZE,
489 .cia_max_keysize = AES_MAX_KEY_SIZE, 479 .cia_max_keysize = AES_MAX_KEY_SIZE,
490 .cia_setkey = aes_set_key, 480 .cia_setkey = aes_set_key,
491 .cia_encrypt = aes_encrypt, 481 .cia_encrypt = aes_enc_blk,
492 .cia_decrypt = aes_decrypt 482 .cia_decrypt = aes_dec_blk
493 } 483 }
494 } 484 }
495}; 485};