diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 06:01:27 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 06:01:27 (GMT) |
| commit | 4f58cb90bcb04cfe18f524d1c9a65edef5eb3f51 (patch) | |
| tree | 8c686e8b736eed7258921909282c0955543c7d2f /crypto/tcrypt.h | |
| parent | e7691a1ce341c80ed9504244a36b31c025217391 (diff) | |
| parent | 08c70fc3a239475122e20b7a21dfae4c264c24f7 (diff) | |
| download | linux-fsl-qoriq-4f58cb90bcb04cfe18f524d1c9a65edef5eb3f51.tar.xz | |
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: (54 commits)
crypto: gf128mul - remove leftover "(EXPERIMENTAL)" in Kconfig
crypto: serpent-sse2 - remove unneeded LRW/XTS #ifdefs
crypto: serpent-sse2 - select LRW and XTS
crypto: twofish-x86_64-3way - remove unneeded LRW/XTS #ifdefs
crypto: twofish-x86_64-3way - select LRW and XTS
crypto: xts - remove dependency on EXPERIMENTAL
crypto: lrw - remove dependency on EXPERIMENTAL
crypto: picoxcell - fix boolean and / or confusion
crypto: caam - remove DECO access initialization code
crypto: caam - fix polarity of "propagate error" logic
crypto: caam - more desc.h cleanups
crypto: caam - desc.h - convert spaces to tabs
crypto: talitos - convert talitos_error to struct device
crypto: talitos - remove NO_IRQ references
crypto: talitos - fix bad kfree
crypto: convert drivers/crypto/* to use module_platform_driver()
char: hw_random: convert drivers/char/hw_random/* to use module_platform_driver()
crypto: serpent-sse2 - should select CRYPTO_CRYPTD
crypto: serpent - rename serpent.c to serpent_generic.c
crypto: serpent - cleanup checkpatch errors and warnings
...
Diffstat (limited to 'crypto/tcrypt.h')
| -rw-r--r-- | crypto/tcrypt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h index 10cb925..5be1fc8 100644 --- a/crypto/tcrypt.h +++ b/crypto/tcrypt.h @@ -51,7 +51,9 @@ static u8 speed_template_8_32[] = {8, 32, 0}; static u8 speed_template_16_32[] = {16, 32, 0}; static u8 speed_template_16_24_32[] = {16, 24, 32, 0}; static u8 speed_template_32_40_48[] = {32, 40, 48, 0}; +static u8 speed_template_32_48[] = {32, 48, 0}; static u8 speed_template_32_48_64[] = {32, 48, 64, 0}; +static u8 speed_template_32_64[] = {32, 64, 0}; /* * Digest speed tests |