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

Commit 071e31e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - Kconfig problem that prevented mxc-rnga from being enabled

   - bogus key sizes in qat aes-xts

   - buggy aes-xts code in vmx"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: vmx - fix null dereference in p8_aes_xts_crypt
  crypto: qat - fix aes-xts key sizes
  hwrng: mxc-rnga - Fix Kconfig dependency
parents 9f834ec1 901d3d4f

drivers/char/hw_random/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ config HW_RANDOM_TX4939 


config HW_RANDOM_MXC_RNGA

	tristate "Freescale i.MX RNGA Random Number Generator"

	depends on ARCH_HAS_RNGA

	depends on SOC_IMX31

	default HW_RANDOM

	---help---

	  This driver provides kernel-side support for the Random Number

drivers/crypto/qat/qat_common/qat_algs.c

+2 −2
Original line number Diff line number Diff line
@@ -1260,8 +1260,8 @@ static struct crypto_alg qat_algs[] = { { 
			.setkey = qat_alg_ablkcipher_xts_setkey,

			.decrypt = qat_alg_ablkcipher_decrypt,

			.encrypt = qat_alg_ablkcipher_encrypt,

			.min_keysize = AES_MIN_KEY_SIZE,

			.max_keysize = AES_MAX_KEY_SIZE,

			.min_keysize = 2 * AES_MIN_KEY_SIZE,

			.max_keysize = 2 * AES_MAX_KEY_SIZE,

			.ivsize = AES_BLOCK_SIZE,

		},

	},

drivers/crypto/vmx/aes_xts.c

+1 −1
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ static int p8_aes_xts_crypt(struct blkcipher_desc *desc, 


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



		iv = (u8 *)walk.iv;

		ret = blkcipher_walk_virt(desc, &walk);

		iv = walk.iv;

		memset(tweak, 0, AES_BLOCK_SIZE);

		aes_p8_encrypt(iv, tweak, &ctx->tweak_key);