2007-02-07 15:47:17

by Herbert Xu

[permalink] [raw]
Subject: Crypto Update for 2.6.21

Hi Dave:

Here is the crypto update for 2.6.21:

Please pull from

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

or

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

Summary:

* Added Camellia, PCBC, DES-like encryption for RxRPC.
* API updates in preparation for async.

Andrew Donofrio (1):
[CRYPTO] tcrypt: Added test vectors for sha384/sha512

David Howells (2):
[CRYPTO] pcbc: Add Propagated CBC template
[CRYPTO] fcrypt: Add FCrypt from RxRPC

Herbert Xu (7):
[CRYPTO] all: Check for usage in hard IRQ context
[CRYPTO] tcrypt: Removed vestigial crypto_alloc_tfm call
[CRYPTO] api: Remove deprecated interface
[CRYPTO] api: Add type-safe spawns
[CRYPTO] api: Allow multiple frontends per backend
[CRYPTO] xcbc: Use new cipher interface
[CRYPTO] api: Use structs for cipher/compression

Noriaki TAKAMIYA (6):
[CRYPTO] camellia: Add Kconfig entry.
[CRYPTO] camellia: added the code of Camellia cipher algorithm.
[CRYPTO] camellia: added the testing code of Camellia cipher
[IPSEC]: added the definition of Camellia cipher
[IPSEC]: added the entry of Camellia cipher algorithm to ealg_list[]
[CRYPTO] doc: added the developer of Camellia cipher

Richard Knutsson (1):
[CRYPTO] geode: Convert pci_module_init() to pci_register_driver()

Documentation/crypto/api-intro.txt | 4
crypto/Kconfig | 31
crypto/Makefile | 3
crypto/algapi.c | 15
crypto/api.c | 80 -
crypto/blkcipher.c | 9
crypto/camellia.c | 1801 +++++++++++++++++++++++++++++++++++++
crypto/cbc.c | 9
crypto/cipher.c | 447 ---------
crypto/compress.c | 5
crypto/digest.c | 24
crypto/ecb.c | 9
crypto/fcrypt.c | 423 ++++++++
crypto/hash.c | 5
crypto/hmac.c | 9
crypto/internal.h | 27
crypto/lrw.c | 11
crypto/pcbc.c | 349 +++++++
crypto/tcrypt.c | 73 +
crypto/tcrypt.h | 538 +++++++++++
crypto/xcbc.c | 60 -
drivers/crypto/geode-aes.c | 2
fs/ecryptfs/crypto.c | 4
fs/ecryptfs/ecryptfs_kernel.h | 1
include/crypto/algapi.h | 24
include/linux/crypto.h | 148 ---
include/linux/pfkeyv2.h | 1
net/xfrm/xfrm_algo.c | 17
28 files changed, 3396 insertions(+), 733 deletions(-)

Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt


2007-02-08 23:26:57

by David Miller

[permalink] [raw]
Subject: Re: Crypto Update for 2.6.21

From: Herbert Xu <[email protected]>
Date: Thu, 8 Feb 2007 02:47:17 +1100

> Here is the crypto update for 2.6.21:
>
> Please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
>
> or
>
> master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git

Pulled, thanks a lot Herbert.

There was a minor merge conflict to resolve, because the
S390 guys removed a bunch of their crypto options from
crypto/Kconfig in a seperate changeset. But I'm pretty
sure I resolved that correctly.

Thanks again.

2007-02-09 12:45:54

by Jan Glauber

[permalink] [raw]
Subject: Re: Crypto Update for 2.6.21

On Thu, 2007-02-08 at 15:26 -0800, David Miller wrote:

> There was a minor merge conflict to resolve, because the
> S390 guys removed a bunch of their crypto options from
> crypto/Kconfig in a seperate changeset. But I'm pretty
> sure I resolved that correctly.

I'll check when the git server works again...

Would it be better if I send patches that also touch common crypto
code to Herbert for integration?

Jan

2007-02-09 15:23:33

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Update for 2.6.21

Jan Glauber <[email protected]> wrote:
>
> Would it be better if I send patches that also touch common crypto
> code to Herbert for integration?

I'm certainly happy to take them.

Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt