Merge tag 'cramfs_fixes' of git://git.linaro.org/people/nicolas.pitre/linux

[platform/kernel/linux-rpi.git] / crypto / authencesn.c

diff --git a/crypto/authencesn.c b/crypto/authencesn.c
index 50b8047..80a25cc 100644 (file)
--- a/crypto/authencesn.c
+++ b/crypto/authencesn.c
@@ -36,7 +36,7 @@ struct crypto_authenc_esn_ctx {
        unsigned int reqoff;
        struct crypto_ahash *auth;
        struct crypto_skcipher *enc;
-       struct crypto_skcipher *null;
+       struct crypto_sync_skcipher *null;
 };
 
 struct authenc_esn_request_ctx {
@@ -183,9 +183,9 @@ static int crypto_authenc_esn_copy(struct aead_request *req, unsigned int len)
 {
        struct crypto_aead *authenc_esn = crypto_aead_reqtfm(req);
        struct crypto_authenc_esn_ctx *ctx = crypto_aead_ctx(authenc_esn);
-       SKCIPHER_REQUEST_ON_STACK(skreq, ctx->null);
+       SYNC_SKCIPHER_REQUEST_ON_STACK(skreq, ctx->null);
 
-       skcipher_request_set_tfm(skreq, ctx->null);
+       skcipher_request_set_sync_tfm(skreq, ctx->null);
        skcipher_request_set_callback(skreq, aead_request_flags(req),
                                      NULL, NULL);
        skcipher_request_set_crypt(skreq, req->src, req->dst, len, NULL);
@@ -341,7 +341,7 @@ static int crypto_authenc_esn_init_tfm(struct crypto_aead *tfm)
        struct crypto_authenc_esn_ctx *ctx = crypto_aead_ctx(tfm);
        struct crypto_ahash *auth;
        struct crypto_skcipher *enc;
-       struct crypto_skcipher *null;
+       struct crypto_sync_skcipher *null;
        int err;
 
        auth = crypto_spawn_ahash(&ictx->auth);