Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e8bff47 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: echainiv - Use skcipher 



This patch replaces use of the obsolete blkcipher with skcipher.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ca0494c0

crypto/echainiv.c

+10 −6
Original line number Diff line number Diff line
@@ -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);



		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_blkcipher_encrypt(

			&desc, req->dst, req->src,

			req->assoclen + req->cryptlen);

		err = crypto_skcipher_encrypt(nreq);

		if (err)

			return err;

	}