crypto: x86/serpent-sse2 - remove LRW algorithm

The LRW template now wraps an ECB mode algorithm rather than the block
cipher directly.  Therefore it is now redundant for crypto modules to
wrap their ECB code with generic LRW code themselves via lrw_crypt().

Remove the lrw-serpent-sse2 algorithm which did this.  Users who request
lrw(serpent) and previously would have gotten lrw-serpent-sse2 will now
get lrw(ecb-serpent-sse2) instead, which is just as fast.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/x86/crypto/serpent_sse2_glue.c b/arch/x86/crypto/serpent_sse2_glue.c
index ac0e831943f59ea3077842e5db8ad895eef0df09..e9de69b4518425a5682b81baf39f52db3fe6fcdd 100644 (file)
--- a/arch/x86/crypto/serpent_sse2_glue.c
+++ b/arch/x86/crypto/serpent_sse2_glue.c
@@ -40,7 +40,6 @@
 #include <crypto/cryptd.h>
 #include <crypto/b128ops.h>
 #include <crypto/ctr.h>
-#include <crypto/lrw.h>
 #include <crypto/xts.h>
 #include <asm/crypto/serpent-sse2.h>
 #include <asm/crypto/glue_helper.h>
@@ -221,85 +220,6 @@ static void decrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
                __serpent_decrypt(ctx->ctx, srcdst, srcdst);
 }
 
-struct serpent_lrw_ctx {
-       struct lrw_table_ctx lrw_table;
-       struct serpent_ctx serpent_ctx;
-};
-
-static int lrw_serpent_setkey(struct crypto_tfm *tfm, const u8 *key,
-                             unsigned int keylen)
-{
-       struct serpent_lrw_ctx *ctx = crypto_tfm_ctx(tfm);
-       int err;
-
-       err = __serpent_setkey(&ctx->serpent_ctx, key, keylen -
-                                                       SERPENT_BLOCK_SIZE);
-       if (err)
-               return err;
-
-       return lrw_init_table(&ctx->lrw_table, key + keylen -
-                                               SERPENT_BLOCK_SIZE);
-}
-
-static int lrw_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
-                      struct scatterlist *src, unsigned int nbytes)
-{
-       struct serpent_lrw_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
-       be128 buf[SERPENT_PARALLEL_BLOCKS];
-       struct crypt_priv crypt_ctx = {
-               .ctx = &ctx->serpent_ctx,
-               .fpu_enabled = false,
-       };
-       struct lrw_crypt_req req = {
-               .tbuf = buf,
-               .tbuflen = sizeof(buf),
-
-               .table_ctx = &ctx->lrw_table,
-               .crypt_ctx = &crypt_ctx,
-               .crypt_fn = encrypt_callback,
-       };
-       int ret;
-
-       desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
-       ret = lrw_crypt(desc, dst, src, nbytes, &req);
-       serpent_fpu_end(crypt_ctx.fpu_enabled);
-
-       return ret;
-}
-
-static int lrw_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
-                      struct scatterlist *src, unsigned int nbytes)
-{
-       struct serpent_lrw_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
-       be128 buf[SERPENT_PARALLEL_BLOCKS];
-       struct crypt_priv crypt_ctx = {
-               .ctx = &ctx->serpent_ctx,
-               .fpu_enabled = false,
-       };
-       struct lrw_crypt_req req = {
-               .tbuf = buf,
-               .tbuflen = sizeof(buf),
-
-               .table_ctx = &ctx->lrw_table,
-               .crypt_ctx = &crypt_ctx,
-               .crypt_fn = decrypt_callback,
-       };
-       int ret;
-
-       desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
-       ret = lrw_crypt(desc, dst, src, nbytes, &req);
-       serpent_fpu_end(crypt_ctx.fpu_enabled);
-
-       return ret;
-}
-
-static void lrw_exit_tfm(struct crypto_tfm *tfm)
-{
-       struct serpent_lrw_ctx *ctx = crypto_tfm_ctx(tfm);
-
-       lrw_free_table(&ctx->lrw_table);
-}
-
 struct serpent_xts_ctx {
        struct serpent_ctx tweak_ctx;
        struct serpent_ctx crypt_ctx;
@@ -378,7 +298,7 @@ static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return ret;
 }
 
-static struct crypto_alg serpent_algs[10] = { {
+static struct crypto_alg serpent_algs[] = { {
        .cra_name               = "__ecb-serpent-sse2",
        .cra_driver_name        = "__driver-ecb-serpent-sse2",
        .cra_priority           = 0,
@@ -439,30 +359,6 @@ static struct crypto_alg serpent_algs[10] = { {
                        .decrypt        = ctr_crypt,
                },
        },
-}, {
-       .cra_name               = "__lrw-serpent-sse2",
-       .cra_driver_name        = "__driver-lrw-serpent-sse2",
-       .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER |
-                                 CRYPTO_ALG_INTERNAL,
-       .cra_blocksize          = SERPENT_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct serpent_lrw_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_exit               = lrw_exit_tfm,
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = SERPENT_MIN_KEY_SIZE +
-                                         SERPENT_BLOCK_SIZE,
-                       .max_keysize    = SERPENT_MAX_KEY_SIZE +
-                                         SERPENT_BLOCK_SIZE,
-                       .ivsize         = SERPENT_BLOCK_SIZE,
-                       .setkey         = lrw_serpent_setkey,
-                       .encrypt        = lrw_encrypt,
-                       .decrypt        = lrw_decrypt,
-               },
-       },
 }, {
        .cra_name               = "__xts-serpent-sse2",
        .cra_driver_name        = "__driver-xts-serpent-sse2",
@@ -550,30 +446,6 @@ static struct crypto_alg serpent_algs[10] = { {
                        .geniv          = "chainiv",
                },
        },
-}, {
-       .cra_name               = "lrw(serpent)",
-       .cra_driver_name        = "lrw-serpent-sse2",
-       .cra_priority           = 400,
-       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
-       .cra_blocksize          = SERPENT_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct async_helper_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_ablkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_init               = ablk_init,
-       .cra_exit               = ablk_exit,
-       .cra_u = {
-               .ablkcipher = {
-                       .min_keysize    = SERPENT_MIN_KEY_SIZE +
-                                         SERPENT_BLOCK_SIZE,
-                       .max_keysize    = SERPENT_MAX_KEY_SIZE +
-                                         SERPENT_BLOCK_SIZE,
-                       .ivsize         = SERPENT_BLOCK_SIZE,
-                       .setkey         = ablk_set_key,
-                       .encrypt        = ablk_encrypt,
-                       .decrypt        = ablk_decrypt,
-               },
-       },
 }, {
        .cra_name               = "xts(serpent)",
        .cra_driver_name        = "xts-serpent-sse2",

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 558eff07b799a5f8622679763108570268f0b6b6..ecc4e56e80ac9f0540fe618ccfb5d9a556c46806 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1427,7 +1427,6 @@ config CRYPTO_SERPENT_SSE2_X86_64
        select CRYPTO_ABLK_HELPER
        select CRYPTO_GLUE_HELPER_X86
        select CRYPTO_SERPENT
-       select CRYPTO_LRW
        select CRYPTO_XTS
        help
          Serpent cipher algorithm, by Anderson, Biham & Knudsen.
@@ -1449,7 +1448,6 @@ config CRYPTO_SERPENT_SSE2_586
        select CRYPTO_ABLK_HELPER
        select CRYPTO_GLUE_HELPER_X86
        select CRYPTO_SERPENT
-       select CRYPTO_LRW
        select CRYPTO_XTS
        help
          Serpent cipher algorithm, by Anderson, Biham & Knudsen.