Linus Torvalds
37d4008484
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: (31 commits)
crypto: aes_generic - Fix checkpatch errors
crypto: fcrypt - Fix checkpatch errors
crypto: ecb - Fix checkpatch errors
crypto: des_generic - Fix checkpatch errors
crypto: deflate - Fix checkpatch errors
crypto: crypto_null - Fix checkpatch errors
crypto: cipher - Fix checkpatch errors
crypto: crc32 - Fix checkpatch errors
crypto: compress - Fix checkpatch errors
crypto: cast6 - Fix checkpatch errors
crypto: cast5 - Fix checkpatch errors
crypto: camellia - Fix checkpatch errors
crypto: authenc - Fix checkpatch errors
crypto: api - Fix checkpatch errors
crypto: anubis - Fix checkpatch errors
crypto: algapi - Fix checkpatch errors
crypto: blowfish - Fix checkpatch errors
crypto: aead - Fix checkpatch errors
crypto: ablkcipher - Fix checkpatch errors
crypto: pcrypt - call the complete function on error
...
2010-02-26 16:50:02 -08:00
Richard Hartmann
8d0c123f8b
crypto: aes_generic - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:34:59 +08:00
Richard Hartmann
0047e81dc3
crypto: fcrypt - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:34:07 +08:00
Richard Hartmann
5b37c19e36
crypto: ecb - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:33:49 +08:00
Richard Hartmann
a501121e30
crypto: des_generic - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:32:31 +08:00
Richard Hartmann
9472d763b3
crypto: deflate - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:32:13 +08:00
Richard Hartmann
c9af70fb86
crypto: crypto_null - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:31:54 +08:00
Richard Hartmann
d150975bc7
crypto: cipher - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:31:37 +08:00
Richard Hartmann
db83aabfe1
crypto: crc32 - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:31:19 +08:00
Richard Hartmann
0375d66dd0
crypto: compress - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:31:04 +08:00
Richard Hartmann
87c3be87e9
crypto: cast6 - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:29:45 +08:00
Richard Hartmann
a1f4c9222d
crypto: cast5 - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:29:01 +08:00
Richard Hartmann
621dd36929
crypto: camellia - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:27:57 +08:00
Richard Hartmann
f3542e6d7b
crypto: authenc - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:27:20 +08:00
Richard Hartmann
3d01a33b77
crypto: api - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:26:46 +08:00
Richard Hartmann
189bd4b056
crypto: anubis - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:25:39 +08:00
Richard Hartmann
5357c6c43e
crypto: algapi - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:25:21 +08:00
Richard Hartmann
0d8fb0a139
crypto: blowfish - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:24:30 +08:00
Richard Hartmann
3922538fe1
crypto: aead - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:24:07 +08:00
Richard Hartmann
c4ede64a6e
crypto: ablkcipher - Fix checkpatch errors
...
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-16 20:23:37 +08:00
Steffen Klassert
5a1436beec
crypto: pcrypt - call the complete function on error
...
This fixes three forgotten calls to the complete function
in the error case.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-02-04 11:40:17 +11:00
Max Vozeler
7d6f75eb21
crypto: md5 - Add export support
...
This patch adds export/import support to md5. The exported type is
defined by struct md5_state.
This is modeled after the equivalent change to sha1_generic.
Signed-off-by: Max Vozeler <max@hinterhof.net >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-01-17 21:55:31 +11:00
Tobias Brunner
73c89c15b9
crypto: gcm - Add RFC4543 wrapper for GCM
...
This patch adds the RFC4543 (GMAC) wrapper for GCM similar to the
existing RFC4106 wrapper. The main differences between GCM and GMAC are
the contents of the AAD and that the plaintext is empty for the latter.
Signed-off-by: Tobias Brunner <tobias@strongswan.org >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-01-17 21:52:11 +11:00
Steffen Klassert
5068c7a883
crypto: pcrypt - Add pcrypt crypto parallelization wrapper
...
This patch adds a parallel crypto template that takes a crypto
algorithm and converts it to process the crypto transforms in
parallel. For the moment only aead algorithms are supported.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2010-01-07 15:57:19 +11:00
Linus Torvalds
05a625486e
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
...
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
drivers/dma: Correct use after free
drivers/dma: drop unnecesary memset
ioat2,3: put channel hardware in known state at init
async_tx: expand async raid6 test to cover ioatdma corner case
ioat3: fix p-disabled q-continuation
sh: fix DMA driver's descriptor chaining and cookie assignment
dma: at_hdmac: correct incompatible type for argument 1 of 'spin_lock_bh'
2009-12-30 13:46:29 -08:00