Skip to content

GitLab

Switch branch/tag
History Find file
Clone
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Linus Torvalds authored 
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
  ...
1ed55eac
Name Last commit Last update
..
asymmetric_keys X.509: Convert some printk calls to pr_devel
async_tx crypto: remove the second argument of k[un]map_atomic()
842.c crypto: 842 - remove .cra_list initialization
Kconfig crypto: cast5/cast6 - move lookup tables to shared module
Makefile crypto: cast5/cast6 - move lookup tables to shared module
ablkcipher.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
aead.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
aes_generic.c crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
af_alg.c atomic: use <linux/atomic.h>
ahash.c crypto: Stop using NLA_PUT*().
algapi.c crypto: algapi - Move larval completion into algboss
algboss.c crypto: algapi - Fix hang on crypto allocation
algif_hash.c crypto: algif_hash - Handle initial af_alg_make_sg error correctly
algif_skcipher.c crypto: algif_skcipher - Handle unaligned receive buffer
ansi_cprng.c crypto: ansi_cprng - use crypto_[un]register_algs
anubis.c crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
api.c crypto: api - Fix checkpatch errors
arc4.c crypto: arc4 - improve performance by using u32 for ctx and variables
authenc.c crypto: authenc - Fix crash with zero-length assoc data
authencesn.c crypto: authencesn - Add algorithm to handle IPsec extended sequence numbers
blkcipher.c crypto: Stop using NLA_PUT*().
blowfish_common.c crypto: blowfish - split generic and common c code
blowfish_generic.c crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
camellia_generic.c crypto: cleanup - remove unneeded crypto_alg.cra_list initializations
cast5_generic.c crypto: cast5/cast6 - move lookup tables to shared module
cast6_generic.c
cast_common.c
cbc.c
ccm.c
chainiv.c
cipher.c
compress.c
crc32c.c
cryptd.c
crypto_null.c
crypto_user.c
crypto_wq.c
ctr.c
cts.c
deflate.c
des_generic.c
ecb.c
eseqiv.c
fcrypt.c
fips.c
gcm.c
gf128mul.c
ghash-generic.c
hmac.c
internal.h
khazad.c
krng.c
lrw.c
lzo.c
md4.c
md5.c
michael_mic.c
pcbc.c
pcompress.c
pcrypt.c
proc.c
ripemd.h
rmd128.c
rmd160.c
rmd256.c
rmd320.c
rng.c
salsa20_generic.c
scatterwalk.c
seed.c
seqiv.c
serpent_generic.c
sha1_generic.c
sha256_generic.c
sha512_generic.c
shash.c
tcrypt.c
tcrypt.h
tea.c
testmgr.c
testmgr.h
tgr192.c
twofish_common.c
twofish_generic.c
vmac.c
wp512.c
xcbc.c
xor.c
xts.c
zlib.c