diff options
| author |   Sebastian Siewior <sebastian@breakpoint.cc> | 2007-11-30 00:15:11 +1100 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-11 08:16:24 +1100 |
| commit | 06e1a8f0505426a97292174a959560fd86ea0a3d (patch) | |
| tree | 4b002a28d57b35d655d74636b52924a20d4b686b /arch/x86/crypto/aes_glue.c | |
| parent | [CRYPTO] gcm: New algorithm (diff) | |
| download | linux-dev-06e1a8f0505426a97292174a959560fd86ea0a3d.tar.xz linux-dev-06e1a8f0505426a97292174a959560fd86ea0a3d.zip | |
[CRYPTO] aes-asm: Merge common glue code
32 bit and 64 bit glue code is using (now) the same
piece code. This patch unifies them.
Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to '')
| -rw-r--r-- | arch/x86/crypto/aes_glue.c (renamed from arch/x86/crypto/aes_64.c) | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/arch/x86/crypto/aes_64.c b/arch/x86/crypto/aes_glue.c index d7a41a97dd3f..71f457827116 100644 --- a/arch/x86/crypto/aes_64.c +++ b/arch/x86/crypto/aes_glue.c @@ -1,5 +1,5 @@ /* - * Glue Code for AES Cipher Algorithm + * Glue Code for the asm optimized version of the AES Cipher Algorithm * */ @@ -19,21 +19,21 @@ static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) } static struct crypto_alg aes_alg = { - .cra_name = "aes", - .cra_driver_name = "aes-x86_64", - .cra_priority = 200, - .cra_flags = CRYPTO_ALG_TYPE_CIPHER, - .cra_blocksize = AES_BLOCK_SIZE, - .cra_ctxsize = sizeof(struct crypto_aes_ctx), - .cra_module = THIS_MODULE, - .cra_list = LIST_HEAD_INIT(aes_alg.cra_list), - .cra_u = { - .cipher = { - .cia_min_keysize = AES_MIN_KEY_SIZE, - .cia_max_keysize = AES_MAX_KEY_SIZE, - .cia_setkey = crypto_aes_set_key, - .cia_encrypt = aes_encrypt, - .cia_decrypt = aes_decrypt + .cra_name = "aes", + .cra_driver_name = "aes-asm", + .cra_priority = 200, + .cra_flags = CRYPTO_ALG_TYPE_CIPHER, + .cra_blocksize = AES_BLOCK_SIZE, + .cra_ctxsize = sizeof(struct crypto_aes_ctx), + .cra_module = THIS_MODULE, + .cra_list = LIST_HEAD_INIT(aes_alg.cra_list), + .cra_u = { + .cipher = { + .cia_min_keysize = AES_MIN_KEY_SIZE, + .cia_max_keysize = AES_MAX_KEY_SIZE, + .cia_setkey = crypto_aes_set_key, + .cia_encrypt = aes_encrypt, + .cia_decrypt = aes_decrypt } } }; @@ -51,6 +51,7 @@ static void __exit aes_fini(void) module_init(aes_init); module_exit(aes_fini); -MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm"); +MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, asm optimized"); MODULE_LICENSE("GPL"); MODULE_ALIAS("aes"); +MODULE_ALIAS("aes-asm"); |