Commit 332a3392188e0ad966543c87b8da2b9d246f301d
Exists in
master
and in
4 other branches
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (102 commits) crypto: sha-s390 - Fix warnings in import function crypto: vmac - New hash algorithm for intel_txt support crypto: api - Do not displace newly registered algorithms crypto: ansi_cprng - Fix module initialization crypto: xcbc - Fix alignment calculation of xcbc_tfm_ctx crypto: fips - Depend on ansi_cprng crypto: blkcipher - Do not use eseqiv on stream ciphers crypto: ctr - Use chainiv on raw counter mode Revert crypto: fips - Select CPRNG crypto: rng - Fix typo crypto: talitos - add support for 36 bit addressing crypto: talitos - align locks on cache lines crypto: talitos - simplify hmac data size calculation crypto: mv_cesa - Add support for Orion5X crypto engine crypto: cryptd - Add support to access underlaying shash crypto: gcm - Use GHASH digest algorithm crypto: ghash - Add GHASH digest algorithm for GCM crypto: authenc - Convert to ahash crypto: api - Fix aligned ctx helper crypto: hmac - Prehash ipad/opad ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 53 changed files Side-by-side Diff
- arch/s390/crypto/des_s390.c
- arch/s390/crypto/sha1_s390.c
- arch/s390/crypto/sha256_s390.c
- arch/s390/crypto/sha512_s390.c
- arch/x86/crypto/aesni-intel_glue.c
- crypto/Kconfig
- crypto/Makefile
- crypto/ablkcipher.c
- crypto/aes_generic.c
- crypto/ahash.c
- crypto/algapi.c
- crypto/algboss.c
- crypto/ansi_cprng.c
- crypto/api.c
- crypto/authenc.c
- crypto/cryptd.c
- crypto/ctr.c
- crypto/gcm.c
- crypto/ghash-generic.c
- crypto/hmac.c
- crypto/internal.h
- crypto/pcompress.c
- crypto/rng.c
- crypto/sha1_generic.c
- crypto/sha256_generic.c
- crypto/sha512_generic.c
- crypto/shash.c
- crypto/tcrypt.c
- crypto/testmgr.c
- crypto/testmgr.h
- crypto/vmac.c
- crypto/xcbc.c
- drivers/char/hw_random/amd-rng.c
- drivers/char/hw_random/geode-rng.c
- drivers/char/random.c
- drivers/crypto/Kconfig
- drivers/crypto/Makefile
- drivers/crypto/amcc/crypto4xx_alg.c
- drivers/crypto/amcc/crypto4xx_core.c
- drivers/crypto/amcc/crypto4xx_core.h
- drivers/crypto/mv_cesa.c
- drivers/crypto/mv_cesa.h
- drivers/crypto/padlock-sha.c
- drivers/crypto/talitos.c
- drivers/crypto/talitos.h
- include/crypto/algapi.h
- include/crypto/cryptd.h
- include/crypto/hash.h
- include/crypto/internal/hash.h
- include/crypto/sha.h
- include/crypto/vmac.h
- include/linux/crypto.h
- include/linux/fips.h