aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/crypto/aes.c14
-rw-r--r--arch/x86_64/crypto/aes-x86_64-asm.S8
-rw-r--r--arch/x86_64/crypto/aes.c14
3 files changed, 28 insertions, 8 deletions
diff --git a/arch/i386/crypto/aes.c b/arch/i386/crypto/aes.c
index b9c7d99160f1..d3806daa3de3 100644
--- a/arch/i386/crypto/aes.c
+++ b/arch/i386/crypto/aes.c
@@ -464,6 +464,16 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
464 return 0; 464 return 0;
465} 465}
466 466
467static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
468{
469 aes_enc_blk(tfm, dst, src);
470}
471
472static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
473{
474 aes_dec_blk(tfm, dst, src);
475}
476
467static struct crypto_alg aes_alg = { 477static struct crypto_alg aes_alg = {
468 .cra_name = "aes", 478 .cra_name = "aes",
469 .cra_driver_name = "aes-i586", 479 .cra_driver_name = "aes-i586",
@@ -478,8 +488,8 @@ static struct crypto_alg aes_alg = {
478 .cia_min_keysize = AES_MIN_KEY_SIZE, 488 .cia_min_keysize = AES_MIN_KEY_SIZE,
479 .cia_max_keysize = AES_MAX_KEY_SIZE, 489 .cia_max_keysize = AES_MAX_KEY_SIZE,
480 .cia_setkey = aes_set_key, 490 .cia_setkey = aes_set_key,
481 .cia_encrypt = aes_enc_blk, 491 .cia_encrypt = aes_encrypt,
482 .cia_decrypt = aes_dec_blk 492 .cia_decrypt = aes_decrypt
483 } 493 }
484 } 494 }
485}; 495};
diff --git a/arch/x86_64/crypto/aes-x86_64-asm.S b/arch/x86_64/crypto/aes-x86_64-asm.S
index f3ba643e144d..26b40de4d0b0 100644
--- a/arch/x86_64/crypto/aes-x86_64-asm.S
+++ b/arch/x86_64/crypto/aes-x86_64-asm.S
@@ -151,9 +151,9 @@ FUNC: movq r1,r2; \
151#define decrypt_final(TAB,OFFSET) \ 151#define decrypt_final(TAB,OFFSET) \
152 round(TAB,OFFSET,R2,R1,R4,R3,R6,R5,R7,R10,R5,R6,R3,R4) 152 round(TAB,OFFSET,R2,R1,R4,R3,R6,R5,R7,R10,R5,R6,R3,R4)
153 153
154/* void aes_encrypt(stuct crypto_tfm *tfm, u8 *out, const u8 *in) */ 154/* void aes_enc_blk(stuct crypto_tfm *tfm, u8 *out, const u8 *in) */
155 155
156 entry(aes_encrypt,0,enc128,enc192) 156 entry(aes_enc_blk,0,enc128,enc192)
157 encrypt_round(aes_ft_tab,-96) 157 encrypt_round(aes_ft_tab,-96)
158 encrypt_round(aes_ft_tab,-80) 158 encrypt_round(aes_ft_tab,-80)
159enc192: encrypt_round(aes_ft_tab,-64) 159enc192: encrypt_round(aes_ft_tab,-64)
@@ -170,9 +170,9 @@ enc128: encrypt_round(aes_ft_tab,-32)
170 encrypt_final(aes_fl_tab,112) 170 encrypt_final(aes_fl_tab,112)
171 return 171 return
172 172
173/* void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) */ 173/* void aes_dec_blk(struct crypto_tfm *tfm, u8 *out, const u8 *in) */
174 174
175 entry(aes_decrypt,240,dec128,dec192) 175 entry(aes_dec_blk,240,dec128,dec192)
176 decrypt_round(aes_it_tab,-96) 176 decrypt_round(aes_it_tab,-96)
177 decrypt_round(aes_it_tab,-80) 177 decrypt_round(aes_it_tab,-80)
178dec192: decrypt_round(aes_it_tab,-64) 178dec192: decrypt_round(aes_it_tab,-64)
diff --git a/arch/x86_64/crypto/aes.c b/arch/x86_64/crypto/aes.c
index d6f8e0463b5d..68866fab37aa 100644
--- a/arch/x86_64/crypto/aes.c
+++ b/arch/x86_64/crypto/aes.c
@@ -283,8 +283,18 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
283 return 0; 283 return 0;
284} 284}
285 285
286extern void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in); 286asmlinkage void aes_enc_blk(struct crypto_tfm *tfm, u8 *out, const u8 *in);
287extern void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in); 287asmlinkage void aes_dec_blk(struct crypto_tfm *tfm, u8 *out, const u8 *in);
288
289static void aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
290{
291 aes_enc_blk(tfm, dst, src);
292}
293
294static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
295{
296 aes_dec_blk(tfm, dst, src);
297}
288 298
289static struct crypto_alg aes_alg = { 299static struct crypto_alg aes_alg = {
290 .cra_name = "aes", 300 .cra_name = "aes",