author | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 24 Nov 2013 00:18:25 +0000 (16:18 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 24 Nov 2013 00:18:25 +0000 (16:18 -0800) |
Pull crypto update from Herbert Xu:
- Made x86 ablk_helper generic for ARM
- Phase out chainiv in favour of eseqiv (affects IPsec)
- Fixed aes-cbc IV corruption on s390
- Added constant-time crypto_memneq which replaces memcmp
- Fixed aes-ctr in omap-aes
- Added OMAP3 ROM RNG support
- Add PRNG support for MSM SoC's
- Add and use Job Ring API in caam
- Misc fixes
[ NOTE! This pull request was sent within the merge window, but Herbert
has some questionable email sending setup that makes him public enemy
#1 as far as gmail is concerned. So most of his emails seem to be
trapped by gmail as spam, resulting in me not seeing them. - Linus ]
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (49 commits)
crypto: s390 - Fix aes-cbc IV corruption
crypto: omap-aes - Fix CTR mode counter length
crypto: omap-sham - Add missing modalias
padata: make the sequence counter an atomic_t
crypto: caam - Modify the interface layers to use JR API's
crypto: caam - Add API's to allocate/free Job Rings
crypto: caam - Add Platform driver for Job Ring
hwrng: msm - Add PRNG support for MSM SoC's
ARM: DT: msm: Add Qualcomm's PRNG driver binding document
crypto: skcipher - Use eseqiv even on UP machines
crypto: talitos - Simplify key parsing
crypto: picoxcell - Simplify and harden key parsing
crypto: ixp4xx - Simplify and harden key parsing
crypto: authencesn - Simplify key parsing
crypto: authenc - Export key parsing helper function
crypto: mv_cesa: remove deprecated IRQF_DISABLED
hwrng: OMAP3 ROM Random Number Generator support
crypto: sha256_ssse3 - also test for BMI2
crypto: mv_cesa - Remove redundant of_match_ptr
crypto: sahara - Remove redundant of_match_ptr
...
- Made x86 ablk_helper generic for ARM
- Phase out chainiv in favour of eseqiv (affects IPsec)
- Fixed aes-cbc IV corruption on s390
- Added constant-time crypto_memneq which replaces memcmp
- Fixed aes-ctr in omap-aes
- Added OMAP3 ROM RNG support
- Add PRNG support for MSM SoC's
- Add and use Job Ring API in caam
- Misc fixes
[ NOTE! This pull request was sent within the merge window, but Herbert
has some questionable email sending setup that makes him public enemy
#1 as far as gmail is concerned. So most of his emails seem to be
trapped by gmail as spam, resulting in me not seeing them. - Linus ]
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (49 commits)
crypto: s390 - Fix aes-cbc IV corruption
crypto: omap-aes - Fix CTR mode counter length
crypto: omap-sham - Add missing modalias
padata: make the sequence counter an atomic_t
crypto: caam - Modify the interface layers to use JR API's
crypto: caam - Add API's to allocate/free Job Rings
crypto: caam - Add Platform driver for Job Ring
hwrng: msm - Add PRNG support for MSM SoC's
ARM: DT: msm: Add Qualcomm's PRNG driver binding document
crypto: skcipher - Use eseqiv even on UP machines
crypto: talitos - Simplify key parsing
crypto: picoxcell - Simplify and harden key parsing
crypto: ixp4xx - Simplify and harden key parsing
crypto: authencesn - Simplify key parsing
crypto: authenc - Export key parsing helper function
crypto: mv_cesa: remove deprecated IRQF_DISABLED
hwrng: OMAP3 ROM Random Number Generator support
crypto: sha256_ssse3 - also test for BMI2
crypto: mv_cesa - Remove redundant of_match_ptr
crypto: sahara - Remove redundant of_match_ptr
...
13 files changed:
1 | 2 | |||
---|---|---|---|---|
arch/arm/mach-tegra/fuse.c | patch | | diff1 | | diff2 | | blob | history |
arch/s390/crypto/aes_s390.c | patch | | diff1 | | diff2 | | blob | history |
crypto/Kconfig | patch | | diff1 | | diff2 | | blob | history |
crypto/Makefile | patch | | diff1 | | diff2 | | blob | history |
crypto/asymmetric_keys/rsa.c | patch | | diff1 | | diff2 | | blob | history |
drivers/char/hw_random/Kconfig | patch | | diff1 | | diff2 | | blob | history |
drivers/char/hw_random/Makefile | patch | | diff1 | | diff2 | | blob | history |
drivers/crypto/caam/ctrl.c | patch | | diff1 | | diff2 | | blob | history |
drivers/crypto/caam/jr.c | patch | | diff1 | | diff2 | | blob | history |
drivers/crypto/ixp4xx_crypto.c | patch | | diff1 | | diff2 | | blob | history |
drivers/crypto/omap-sham.c | patch | | diff1 | | diff2 | | blob | history |
drivers/crypto/talitos.c | patch | | diff1 | | diff2 | | blob | history |
drivers/crypto/tegra-aes.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/mach-tegra/fuse.c
Simple merge
diff --cc arch/s390/crypto/aes_s390.c
Simple merge
diff --cc crypto/Kconfig
Simple merge
diff --cc crypto/Makefile
index b3a7e807e08bca306619a3e7250afbc9160fecbe,d6a401c58d17699e77f198a447aa67fd75e71cc4..989c510da8cc98af911976874d6c16db865ee1b3
--- 1/crypto/Makefile
--- 2/crypto/Makefile
+++ b/crypto/Makefile
obj-$(CONFIG_XOR_BLOCKS) += xor.o
obj-$(CONFIG_ASYNC_CORE) += async_tx/
obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
+obj-$(CONFIG_CRYPTO_HASH_INFO) += hash_info.o
+ obj-$(CONFIG_CRYPTO_ABLK_HELPER) += ablk_helper.o
diff --cc crypto/asymmetric_keys/rsa.c
Simple merge
diff --cc drivers/char/hw_random/Kconfig
Simple merge
diff --cc drivers/char/hw_random/Makefile
Simple merge
diff --cc drivers/crypto/caam/ctrl.c
Simple merge
diff --cc drivers/crypto/caam/jr.c
index bdb786d5a5e5b0216b968a833592d8aef7c96d8d,636bb53125abb4ec9b2db615dd130c02cec3ada7..d23356d20e1ca430e5993aaf77b88b39b82fe651
+++ b/drivers/crypto/caam/jr.c
dma_set_mask(jrdev, DMA_BIT_MASK(32));
/* Identify the interrupt */
- jrpriv->irq = irq_of_parse_and_map(np, 0);
- jrpriv->irq = of_irq_to_resource(nprop, 0, NULL);
++ jrpriv->irq = irq_of_parse_and_map(nprop, 0);
/* Now do the platform independent part */
error = caam_jr_init(jrdev); /* now turn on hardware */
diff --cc drivers/crypto/ixp4xx_crypto.c
Simple merge
diff --cc drivers/crypto/omap-sham.c
Simple merge
diff --cc drivers/crypto/talitos.c
Simple merge
diff --cc drivers/crypto/tegra-aes.c
Simple merge