Commit fd7cbef6 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: x86/aegis - use the new scatterwalk functions 



In crypto_aegis128_aesni_process_ad(), use scatterwalk_next() which
consolidates scatterwalk_clamp() and scatterwalk_map().  Use
scatterwalk_done_src() which consolidates scatterwalk_unmap(),
scatterwalk_advance(), and scatterwalk_done().

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e9787def

arch/x86/crypto/aegis128-aesni-glue.c

+4 −6
Original line number Diff line number Diff line
@@ -71,10 +71,10 @@ static void crypto_aegis128_aesni_process_ad( 


	scatterwalk_start(&walk, sg_src);

	while (assoclen != 0) {

		unsigned int size = scatterwalk_clamp(&walk, assoclen);

		unsigned int size;

		const u8 *mapped = scatterwalk_next(&walk, assoclen, &size);

		unsigned int left = size;

		void *mapped = scatterwalk_map(&walk);

		const u8 *src = (const u8 *)mapped;

		const u8 *src = mapped;



		if (pos + size >= AEGIS128_BLOCK_SIZE) {

			if (pos > 0) {
@@ -97,9 +97,7 @@ static void crypto_aegis128_aesni_process_ad( 
		pos += left;

		assoclen -= size;



		scatterwalk_unmap(mapped);

		scatterwalk_advance(&walk, size);

		scatterwalk_done(&walk, 0, assoclen);

		scatterwalk_done_src(&walk, mapped, size);

	}



	if (pos > 0) {