aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto/padlock-aes.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/crypto/padlock-aes.c')
-rw-r--r--drivers/crypto/padlock-aes.c55
1 files changed, 53 insertions, 2 deletions
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 5f28909d4012..d2745ff4699c 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -390,7 +390,7 @@ aes_set_key(void *ctx_arg, const uint8_t *in_key, unsigned int key_len, uint32_t
390 390
391/* ====== Encryption/decryption routines ====== */ 391/* ====== Encryption/decryption routines ====== */
392 392
393/* This is the real call to PadLock. */ 393/* These are the real call to PadLock. */
394static inline void padlock_xcrypt_ecb(const u8 *input, u8 *output, void *key, 394static inline void padlock_xcrypt_ecb(const u8 *input, u8 *output, void *key,
395 void *control_word, u32 count) 395 void *control_word, u32 count)
396{ 396{
@@ -400,6 +400,17 @@ static inline void padlock_xcrypt_ecb(const u8 *input, u8 *output, void *key,
400 : "d"(control_word), "b"(key), "c"(count)); 400 : "d"(control_word), "b"(key), "c"(count));
401} 401}
402 402
403static inline void padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,
404 u8 *iv, void *control_word, u32 count)
405{
406 /* Enforce key reload. */
407 asm volatile ("pushfl; popfl");
408 /* rep xcryptcbc */
409 asm volatile (".byte 0xf3,0x0f,0xa7,0xd0"
410 : "+S" (input), "+D" (output), "+a" (iv)
411 : "d" (control_word), "b" (key), "c" (count));
412}
413
403static void 414static void
404aes_encrypt(void *ctx_arg, uint8_t *out, const uint8_t *in) 415aes_encrypt(void *ctx_arg, uint8_t *out, const uint8_t *in)
405{ 416{
@@ -414,6 +425,42 @@ aes_decrypt(void *ctx_arg, uint8_t *out, const uint8_t *in)
414 padlock_xcrypt_ecb(in, out, ctx->D, &ctx->cword.decrypt, 1); 425 padlock_xcrypt_ecb(in, out, ctx->D, &ctx->cword.decrypt, 1);
415} 426}
416 427
428static unsigned int aes_encrypt_ecb(const struct cipher_desc *desc, u8 *out,
429 const u8 *in, unsigned int nbytes)
430{
431 struct aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(desc->tfm));
432 padlock_xcrypt_ecb(in, out, ctx->E, &ctx->cword.encrypt,
433 nbytes / AES_BLOCK_SIZE);
434 return nbytes & ~(AES_BLOCK_SIZE - 1);
435}
436
437static unsigned int aes_decrypt_ecb(const struct cipher_desc *desc, u8 *out,
438 const u8 *in, unsigned int nbytes)
439{
440 struct aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(desc->tfm));
441 padlock_xcrypt_ecb(in, out, ctx->D, &ctx->cword.decrypt,
442 nbytes / AES_BLOCK_SIZE);
443 return nbytes & ~(AES_BLOCK_SIZE - 1);
444}
445
446static unsigned int aes_encrypt_cbc(const struct cipher_desc *desc, u8 *out,
447 const u8 *in, unsigned int nbytes)
448{
449 struct aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(desc->tfm));
450 padlock_xcrypt_cbc(in, out, ctx->E, desc->info, &ctx->cword.encrypt,
451 nbytes / AES_BLOCK_SIZE);
452 return nbytes & ~(AES_BLOCK_SIZE - 1);
453}
454
455static unsigned int aes_decrypt_cbc(const struct cipher_desc *desc, u8 *out,
456 const u8 *in, unsigned int nbytes)
457{
458 struct aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(desc->tfm));
459 padlock_xcrypt_cbc(in, out, ctx->D, desc->info, &ctx->cword.decrypt,
460 nbytes / AES_BLOCK_SIZE);
461 return nbytes & ~(AES_BLOCK_SIZE - 1);
462}
463
417static struct crypto_alg aes_alg = { 464static struct crypto_alg aes_alg = {
418 .cra_name = "aes", 465 .cra_name = "aes",
419 .cra_flags = CRYPTO_ALG_TYPE_CIPHER, 466 .cra_flags = CRYPTO_ALG_TYPE_CIPHER,
@@ -429,7 +476,11 @@ static struct crypto_alg aes_alg = {
429 .cia_max_keysize = AES_MAX_KEY_SIZE, 476 .cia_max_keysize = AES_MAX_KEY_SIZE,
430 .cia_setkey = aes_set_key, 477 .cia_setkey = aes_set_key,
431 .cia_encrypt = aes_encrypt, 478 .cia_encrypt = aes_encrypt,
432 .cia_decrypt = aes_decrypt 479 .cia_decrypt = aes_decrypt,
480 .cia_encrypt_ecb = aes_encrypt_ecb,
481 .cia_decrypt_ecb = aes_decrypt_ecb,
482 .cia_encrypt_cbc = aes_encrypt_cbc,
483 .cia_decrypt_cbc = aes_decrypt_cbc,
433 } 484 }
434 } 485 }
435}; 486};