Permalink
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:

 - Added aesni/avx/x86_64 implementations for camellia.

 - Optimised AVX code for cast5/serpent/twofish/cast6.

 - Fixed vmac bug with unaligned input.

 - Allow compression algorithms in FIPS mode.

 - Optimised crc32c implementation for Intel.

 - Misc fixes.

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (32 commits)
  crypto: caam - Updated SEC-4.0 device tree binding for ERA information.
  crypto: testmgr - remove superfluous initializers for xts(aes)
  crypto: testmgr - allow compression algs in fips mode
  crypto: testmgr - add larger crc32c test vector to test FPU path in crc32c_intel
  crypto: testmgr - clean alg_test_null entries in alg_test_descs[]
  crypto: testmgr - remove fips_allowed flag from camellia-aesni null-tests
  crypto: cast5/cast6 - move lookup tables to shared module
  padata: use __this_cpu_read per-cpu helper
  crypto: s5p-sss - Fix compilation error
  crypto: picoxcell - Add terminating entry for platform_device_id table
  crypto: omap-aes - select BLKCIPHER2
  crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher
  crypto: camellia-x86_64 - share common functions and move structures and function definitions to header file
  crypto: tcrypt - add async speed test for camellia cipher
  crypto: tegra-aes - fix error-valued pointer dereference
  crypto: tegra - fix missing unlock on error case
  crypto: cast5/avx - avoid using temporary stack buffers
  crypto: serpent/avx - avoid using temporary stack buffers
  crypto: twofish/avx - avoid using temporary stack buffers
  crypto: cast6/avx - avoid using temporary stack buffers
  ...
  • Loading branch information...
torvalds committed Dec 15, 2012
2 parents 08242bc + a2c0911 commit 1ed55eac3b1fc30b29cdb52251e0f13b24fc344c
Showing with 9,391 additions and 1,686 deletions.
  1. +3 −2 Documentation/devicetree/bindings/crypto/fsl-sec4.txt
  2. +5 −0 arch/x86/crypto/Makefile
  3. +1,102 −0 arch/x86/crypto/camellia-aesni-avx-asm_64.S
  4. +558 −0 arch/x86/crypto/camellia_aesni_avx_glue.c
  5. +29 −63 arch/x86/crypto/camellia_glue.c
  6. +265 −83 arch/x86/crypto/cast5-avx-x86_64-asm_64.S
  7. +23 −56 arch/x86/crypto/cast5_avx_glue.c
  8. +131 −75 arch/x86/crypto/cast6-avx-x86_64-asm_64.S
  9. +16 −61 arch/x86/crypto/cast6_avx_glue.c
  10. +81 −0 arch/x86/crypto/{crc32c-intel.c → crc32c-intel_glue.c}
  11. +460 −0 arch/x86/crypto/crc32c-pcl-intel-asm_64.S
  12. +91 −0 arch/x86/crypto/glue_helper-asm-avx.S
  13. +6 −6 arch/x86/crypto/glue_helper.c
  14. +108 −58 arch/x86/crypto/serpent-avx-x86_64-asm_64.S
  15. +9 −40 arch/x86/crypto/serpent_avx_glue.c
  16. +6 −6 arch/x86/crypto/serpent_sse2_glue.c
  17. +137 −71 arch/x86/crypto/twofish-avx-x86_64-asm_64.S
  18. +15 −58 arch/x86/crypto/twofish_avx_glue.c
  19. +10 −10 arch/x86/crypto/twofish_glue_3way.c
  20. +82 −0 arch/x86/include/asm/crypto/camellia.h
  21. +17 −11 arch/x86/include/asm/crypto/glue_helper.h
  22. +7 −20 arch/x86/include/asm/crypto/serpent-avx.h
  23. +2 −2 arch/x86/include/asm/crypto/twofish.h
  24. +42 −0 crypto/Kconfig
  25. +1 −0 crypto/Makefile
  26. +4 −273 crypto/cast5_generic.c
  27. +4 −276 crypto/cast6_generic.c
  28. +290 −0 crypto/cast_common.c
  29. +29 −0 crypto/tcrypt.c
  30. +45 −324 crypto/testmgr.c
  31. +5,744 −168 crypto/testmgr.h
  32. +43 −4 crypto/vmac.c
  33. +1 −0 drivers/crypto/Kconfig
  34. +1 −0 drivers/crypto/picoxcell_crypto.c
  35. +1 −1 drivers/crypto/s5p-sss.c
  36. +1 −2 drivers/crypto/talitos.c
  37. +7 −3 drivers/crypto/tegra-aes.c
  38. +1 −5 include/crypto/cast5.h
  39. +1 −5 include/crypto/cast6.h
  40. +9 −0 include/crypto/cast_common.h
  41. +2 −0 include/crypto/vmac.h
  42. +2 −3 kernel/padata.c
@@ -54,7 +54,8 @@ PROPERTIES
- compatible
Usage: required
Value type: <string>
- Definition: Must include "fsl,sec-v4.0"
+ Definition: Must include "fsl,sec-v4.0". Also includes SEC
+ ERA versions (optional) with which the device is compatible.
- #address-cells
Usage: required
@@ -106,7 +107,7 @@ PROPERTIES
EXAMPLE
crypto@300000 {
- compatible = "fsl,sec-v4.0";
+ compatible = "fsl,sec-v4.0", "fsl,sec-era-v2.0";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x300000 0x10000>;
View
@@ -12,6 +12,7 @@ obj-$(CONFIG_CRYPTO_SERPENT_SSE2_586) += serpent-sse2-i586.o
obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
obj-$(CONFIG_CRYPTO_CAMELLIA_X86_64) += camellia-x86_64.o
+obj-$(CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64) += camellia-aesni-avx-x86_64.o
obj-$(CONFIG_CRYPTO_CAST5_AVX_X86_64) += cast5-avx-x86_64.o
obj-$(CONFIG_CRYPTO_CAST6_AVX_X86_64) += cast6-avx-x86_64.o
obj-$(CONFIG_CRYPTO_BLOWFISH_X86_64) += blowfish-x86_64.o
@@ -34,6 +35,8 @@ serpent-sse2-i586-y := serpent-sse2-i586-asm_32.o serpent_sse2_glue.o
aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o
camellia-x86_64-y := camellia-x86_64-asm_64.o camellia_glue.o
+camellia-aesni-avx-x86_64-y := camellia-aesni-avx-asm_64.o \
+ camellia_aesni_avx_glue.o
cast5-avx-x86_64-y := cast5-avx-x86_64-asm_64.o cast5_avx_glue.o
cast6-avx-x86_64-y := cast6-avx-x86_64-asm_64.o cast6_avx_glue.o
blowfish-x86_64-y := blowfish-x86_64-asm_64.o blowfish_glue.o
@@ -47,3 +50,5 @@ serpent-avx-x86_64-y := serpent-avx-x86_64-asm_64.o serpent_avx_glue.o
aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o fpu.o
ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o
sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o
+crc32c-intel-y := crc32c-intel_glue.o
+crc32c-intel-$(CONFIG_CRYPTO_CRC32C_X86_64) += crc32c-pcl-intel-asm_64.o
Oops, something went wrong.

0 comments on commit 1ed55ea

Please sign in to comment.