Merge tag 'for-f2fs-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[cascardo/linux.git] / crypto / echainiv.c

diff --git a/crypto/echainiv.c b/crypto/echainiv.c
index b96a845..1b01fe9 100644 (file)
--- a/crypto/echainiv.c
+++ b/crypto/echainiv.c
@@ -20,6 +20,7 @@
 
 #include <crypto/internal/geniv.h>
 #include <crypto/scatterwalk.h>
+#include <crypto/skcipher.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -112,13 +113,16 @@ static int echainiv_encrypt(struct aead_request *req)
        info = req->iv;
 
        if (req->src != req->dst) {
-               struct blkcipher_desc desc = {
-                       .tfm = ctx->null,
-               };
+               SKCIPHER_REQUEST_ON_STACK(nreq, ctx->sknull);
 
-               err = crypto_blkcipher_encrypt(
-                       &desc, req->dst, req->src,
-                       req->assoclen + req->cryptlen);
+               skcipher_request_set_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;
        }