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

Commit d2456c66 authored by Sebastian Siewior's avatar Sebastian Siewior Committed by Herbert Xu
Browse files

[CRYPTO] geode: do not copy the IV too often 



There is no reason to keep the IV in the private structre. Instead keep
just a pointer to make the patch smaller :)
This also remove a few memcpy()s

Signed-off-by: default avatarSebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9617d6ef

drivers/crypto/geode-aes.c

+2 −4
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ geode_cbc_decrypt(struct blkcipher_desc *desc, 


	blkcipher_walk_init(&walk, dst, src, nbytes);

	err = blkcipher_walk_virt(desc, &walk);

	memcpy(op->iv, walk.iv, AES_IV_LENGTH);

	op->iv = walk.iv;



	while((nbytes = walk.nbytes)) {

		op->src = walk.src.virt.addr,
@@ -330,7 +330,6 @@ geode_cbc_decrypt(struct blkcipher_desc *desc, 
		err = blkcipher_walk_done(desc, &walk, nbytes);

	}



	memcpy(walk.iv, op->iv, AES_IV_LENGTH);

	return err;

}
@@ -348,7 +347,7 @@ geode_cbc_encrypt(struct blkcipher_desc *desc, 


	blkcipher_walk_init(&walk, dst, src, nbytes);

	err = blkcipher_walk_virt(desc, &walk);

	memcpy(op->iv, walk.iv, AES_IV_LENGTH);

	op->iv = walk.iv;



	while((nbytes = walk.nbytes)) {

		op->src = walk.src.virt.addr,
@@ -362,7 +361,6 @@ geode_cbc_encrypt(struct blkcipher_desc *desc, 
		err = blkcipher_walk_done(desc, &walk, nbytes);

	}



	memcpy(walk.iv, op->iv, AES_IV_LENGTH);

	return err;

}

drivers/crypto/geode-aes.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct geode_aes_op { 
	int len;



	u8 key[AES_KEY_LENGTH];

	u8 iv[AES_IV_LENGTH];

	u8 *iv;



	union {

		struct crypto_blkcipher *blk;