tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 071e31e2 9f834ec1

+4 -4
+1 -1
drivers/char/hw_random/Kconfig
··· 244 244 245 245 config HW_RANDOM_MXC_RNGA 246 246 tristate "Freescale i.MX RNGA Random Number Generator" 247 - depends on ARCH_HAS_RNGA 247 + depends on SOC_IMX31 248 248 default HW_RANDOM 249 249 ---help--- 250 250 This driver provides kernel-side support for the Random Number
+2 -2
drivers/crypto/qat/qat_common/qat_algs.c
··· 1260 1260 .setkey = qat_alg_ablkcipher_xts_setkey, 1261 1261 .decrypt = qat_alg_ablkcipher_decrypt, 1262 1262 .encrypt = qat_alg_ablkcipher_encrypt, 1263 - .min_keysize = AES_MIN_KEY_SIZE, 1264 - .max_keysize = AES_MAX_KEY_SIZE, 1263 + .min_keysize = 2 * AES_MIN_KEY_SIZE, 1264 + .max_keysize = 2 * AES_MAX_KEY_SIZE, 1265 1265 .ivsize = AES_BLOCK_SIZE, 1266 1266 }, 1267 1267 },
+1 -1
drivers/crypto/vmx/aes_xts.c
··· 129 129 130 130 blkcipher_walk_init(&walk, dst, src, nbytes); 131 131 132 - iv = (u8 *)walk.iv; 133 132 ret = blkcipher_walk_virt(desc, &walk); 133 + iv = walk.iv; 134 134 memset(tweak, 0, AES_BLOCK_SIZE); 135 135 aes_p8_encrypt(iv, tweak, &ctx->tweak_key); 136 136