Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / arch / x86 / crypto / aesni-intel_glue.c

diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index e9b866e87d48e69603be02f18035d58e13ba4a9b..73c0ccb009a0f73f28e129bb92ceb9c784767eb8 100644 (file)
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -371,20 +371,6 @@ static void aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
        }
 }
 
-static void __aes_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
-{
-       struct crypto_aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(tfm));
-
-       aesni_enc(ctx, dst, src);
-}
-
-static void __aes_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
-{
-       struct crypto_aes_ctx *ctx = aes_ctx(crypto_tfm_ctx(tfm));
-
-       aesni_dec(ctx, dst, src);
-}
-
 static int aesni_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,
                                 unsigned int len)
 {
@@ -920,7 +906,7 @@ static int helper_rfc4106_decrypt(struct aead_request *req)
 }
 #endif
 
-static struct crypto_alg aesni_algs[] = { {
+static struct crypto_alg aesni_cipher_alg = {
        .cra_name               = "aes",
        .cra_driver_name        = "aes-aesni",
        .cra_priority           = 300,
@@ -937,24 +923,7 @@ static struct crypto_alg aesni_algs[] = { {
                        .cia_decrypt            = aes_decrypt
                }
        }
-}, {
-       .cra_name               = "__aes",
-       .cra_driver_name        = "__aes-aesni",
-       .cra_priority           = 300,
-       .cra_flags              = CRYPTO_ALG_TYPE_CIPHER | CRYPTO_ALG_INTERNAL,
-       .cra_blocksize          = AES_BLOCK_SIZE,
-       .cra_ctxsize            = CRYPTO_AES_CTX_SIZE,
-       .cra_module             = THIS_MODULE,
-       .cra_u  = {
-               .cipher = {
-                       .cia_min_keysize        = AES_MIN_KEY_SIZE,
-                       .cia_max_keysize        = AES_MAX_KEY_SIZE,
-                       .cia_setkey             = aes_set_key,
-                       .cia_encrypt            = __aes_encrypt,
-                       .cia_decrypt            = __aes_decrypt
-               }
-       }
-} };
+};
 
 static struct skcipher_alg aesni_skciphers[] = {
        {
@@ -1150,7 +1119,7 @@ static int __init aesni_init(void)
 #endif
 #endif
 
-       err = crypto_register_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
+       err = crypto_register_alg(&aesni_cipher_alg);
        if (err)
                return err;
 
@@ -1158,7 +1127,7 @@ static int __init aesni_init(void)
                                             ARRAY_SIZE(aesni_skciphers),
                                             aesni_simd_skciphers);
        if (err)
-               goto unregister_algs;
+               goto unregister_cipher;
 
        err = simd_register_aeads_compat(aesni_aeads, ARRAY_SIZE(aesni_aeads),
                                         aesni_simd_aeads);
@@ -1170,8 +1139,8 @@ static int __init aesni_init(void)
 unregister_skciphers:
        simd_unregister_skciphers(aesni_skciphers, ARRAY_SIZE(aesni_skciphers),
                                  aesni_simd_skciphers);
-unregister_algs:
-       crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
+unregister_cipher:
+       crypto_unregister_alg(&aesni_cipher_alg);
        return err;
 }
 
@@ -1181,7 +1150,7 @@ static void __exit aesni_exit(void)
                              aesni_simd_aeads);
        simd_unregister_skciphers(aesni_skciphers, ARRAY_SIZE(aesni_skciphers),
                                  aesni_simd_skciphers);
-       crypto_unregister_algs(aesni_algs, ARRAY_SIZE(aesni_algs));
+       crypto_unregister_alg(&aesni_cipher_alg);
 }
 
 late_initcall(aesni_init);