crypto: geniv - use memcpy_sglist() instead of null skcipher

For copying data between two scatterlists, just use memcpy_sglist()
instead of the so-called "null skcipher".  This is much simpler.

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

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 231791703594d7982c83a41a4d80ef067721bd5c..f0c8cc5e30ae591fc4dcad1bcda1f1f0f2712b05 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -815,7 +815,6 @@ config CRYPTO_GCM
 config CRYPTO_GENIV
        tristate
        select CRYPTO_AEAD
-       select CRYPTO_NULL
        select CRYPTO_MANAGER
        select CRYPTO_RNG_DEFAULT
 

diff --git a/crypto/echainiv.c b/crypto/echainiv.c
index 1913be8dfbbad58bd546139e64f3af0aa2b7e94f..e0a2d320993823ed39800f49e66832797144b797 100644 (file)
--- a/crypto/echainiv.c
+++ b/crypto/echainiv.c
@@ -32,7 +32,6 @@ static int echainiv_encrypt(struct aead_request *req)
        u64 seqno;
        u8 *info;
        unsigned int ivsize = crypto_aead_ivsize(geniv);
-       int err;
 
        if (req->cryptlen < ivsize)
                return -EINVAL;
@@ -41,20 +40,9 @@ static int echainiv_encrypt(struct aead_request *req)
 
        info = req->iv;
 
-       if (req->src != req->dst) {
-               SYNC_SKCIPHER_REQUEST_ON_STACK(nreq, ctx->sknull);
-
-               skcipher_request_set_sync_tfm(nreq, ctx->sknull);
-               skcipher_request_set_callback(nreq, req->base.flags,
-                                             NULL, NULL);
-               skcipher_request_set_crypt(nreq, req->src, req->dst,
-                                          req->assoclen + req->cryptlen,
-                                          NULL);
-
-               err = crypto_skcipher_encrypt(nreq);
-               if (err)
-                       return err;
-       }
+       if (req->src != req->dst)
+               memcpy_sglist(req->dst, req->src,
+                             req->assoclen + req->cryptlen);
 
        aead_request_set_callback(subreq, req->base.flags,
                                  req->base.complete, req->base.data);

diff --git a/crypto/geniv.c b/crypto/geniv.c
index bee4621b4f1251850b4fae7fba3760e0b35fcdf5..42eff6a7387c13ce5bf576413e3d0e8553dcdcf8 100644 (file)
--- a/crypto/geniv.c
+++ b/crypto/geniv.c
@@ -9,7 +9,6 @@
 
 #include <crypto/internal/geniv.h>
 #include <crypto/internal/rng.h>
-#include <crypto/null.h>
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -125,15 +124,10 @@ int aead_init_geniv(struct crypto_aead *aead)
        if (err)
                goto out;
 
-       ctx->sknull = crypto_get_default_null_skcipher();
-       err = PTR_ERR(ctx->sknull);
-       if (IS_ERR(ctx->sknull))
-               goto out;
-
        child = crypto_spawn_aead(aead_instance_ctx(inst));
        err = PTR_ERR(child);
        if (IS_ERR(child))
-               goto drop_null;
+               goto out;
 
        ctx->child = child;
        crypto_aead_set_reqsize(aead, crypto_aead_reqsize(child) +
@@ -143,10 +137,6 @@ int aead_init_geniv(struct crypto_aead *aead)
 
 out:
        return err;
-
-drop_null:
-       crypto_put_default_null_skcipher();
-       goto out;
 }
 EXPORT_SYMBOL_GPL(aead_init_geniv);
 
@@ -155,7 +145,6 @@ void aead_exit_geniv(struct crypto_aead *tfm)
        struct aead_geniv_ctx *ctx = crypto_aead_ctx(tfm);
 
        crypto_free_aead(ctx->child);
-       crypto_put_default_null_skcipher();
 }
 EXPORT_SYMBOL_GPL(aead_exit_geniv);
 

diff --git a/crypto/seqiv.c b/crypto/seqiv.c
index a17ef51843989ee35267200269de3723ee4b712e..2bae99e3352683285c9d57cd530286631e9db732 100644 (file)
--- a/crypto/seqiv.c
+++ b/crypto/seqiv.c
@@ -64,20 +64,9 @@ static int seqiv_aead_encrypt(struct aead_request *req)
        data = req->base.data;
        info = req->iv;
 
-       if (req->src != req->dst) {
-               SYNC_SKCIPHER_REQUEST_ON_STACK(nreq, ctx->sknull);
-
-               skcipher_request_set_sync_tfm(nreq, ctx->sknull);
-               skcipher_request_set_callback(nreq, req->base.flags,
-                                             NULL, NULL);
-               skcipher_request_set_crypt(nreq, req->src, req->dst,
-                                          req->assoclen + req->cryptlen,
-                                          NULL);
-
-               err = crypto_skcipher_encrypt(nreq);
-               if (err)
-                       return err;
-       }
+       if (req->src != req->dst)
+               memcpy_sglist(req->dst, req->src,
+                             req->assoclen + req->cryptlen);
 
        if (unlikely(!IS_ALIGNED((unsigned long)info,
                                 crypto_aead_alignmask(geniv) + 1))) {

diff --git a/include/crypto/internal/geniv.h b/include/crypto/internal/geniv.h
index 7fd7126f593af5ff689fd09eacca89dff5ab996f..012f5fb22d43f18a186ffe11cc6745cd019289fb 100644 (file)
--- a/include/crypto/internal/geniv.h
+++ b/include/crypto/internal/geniv.h
@@ -15,7 +15,6 @@
 struct aead_geniv_ctx {
        spinlock_t lock;
        struct crypto_aead *child;
-       struct crypto_sync_skcipher *sknull;
        u8 salt[] __attribute__ ((aligned(__alignof__(u32))));
 };