mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* Crypto Update for 2.6.23
@ 2007-07-11 13:08 Herbert Xu
  2007-07-15  6:48 ` David Miller
  0 siblings, 1 reply; 4+ messages in thread
From: Herbert Xu @ 2007-07-11 13:08 UTC (permalink / raw)
  To: David S. Miller, Linus Torvalds, Linux Crypto Mailing List,
	Linux Kernel Mailing List

Hi:

iHere is the crypto update for 2.6.23:

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:

* Small fixes and clean-up's.


Herbert Xu (2):
      [CRYPTO] api: Wake up all waiters when larval completes
      [CRYPTO] cipher: Remove obsolete fields from cipher_tfm

Jan Engelhardt (1):
      [CRYPTO] Kconfig: Use menuconfig objects

Sebastian Siewior (2):
      [CRYPTO] api: Handle unaligned keys in setkey
      [CRYPTO] api: Allow ablkcipher with no queues

 crypto/Kconfig         |    6 +-----
 crypto/ablkcipher.c    |   31 +++++++++++++++++++++++++++++--
 crypto/algapi.c        |    4 ++--
 crypto/api.c           |    2 +-
 crypto/blkcipher.c     |   25 +++++++++++++++++++++++++
 crypto/cipher.c        |   33 ++++++++++++++++++++++++++++++---
 crypto/hash.c          |   38 +++++++++++++++++++++++++++++++++++++-
 include/linux/crypto.h |   20 --------------------
 8 files changed, 125 insertions(+), 34 deletions(-)

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Crypto Update for 2.6.23
  2007-07-11 13:08 Crypto Update for 2.6.23 Herbert Xu
@ 2007-07-15  6:48 ` David Miller
  2007-07-15 13:15   ` Herbert Xu
  0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2007-07-15  6:48 UTC (permalink / raw)
  To: herbert; +Cc: torvalds, linux-crypto, linux-kernel, akpm

From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 11 Jul 2007 21:08:49 +0800

> Here is the crypto update for 2.6.23:
> 
> 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

I merged this into my net-2.6 tree, there was a tiny conflict
in crypto/Kconfig I had to resolve because of the async_tx
stuff that went in upstream.

Herbert can you contact the async_tx author to make sure that
his crypto/ bits go through you in the future so that conflicts
like this can be avoided?

Thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Crypto Update for 2.6.23
  2007-07-15  6:48 ` David Miller
@ 2007-07-15 13:15   ` Herbert Xu
  2007-07-16  0:35     ` David Miller
  0 siblings, 1 reply; 4+ messages in thread
From: Herbert Xu @ 2007-07-15 13:15 UTC (permalink / raw)
  To: David Miller; +Cc: torvalds, linux-crypto, linux-kernel, akpm

On Sat, Jul 14, 2007 at 11:48:39PM -0700, David Miller wrote:
>
> I merged this into my net-2.6 tree, there was a tiny conflict
> in crypto/Kconfig I had to resolve because of the async_tx
> stuff that went in upstream.

Thanks!

> Herbert can you contact the async_tx author to make sure that
> his crypto/ bits go through you in the future so that conflicts
> like this can be avoided?

No problems.  This was a once-off because it involved multiple
conflicts all over the place as Andrew can no doubt attest to :)

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Crypto Update for 2.6.23
  2007-07-15 13:15   ` Herbert Xu
@ 2007-07-16  0:35     ` David Miller
  0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2007-07-16  0:35 UTC (permalink / raw)
  To: herbert; +Cc: torvalds, linux-crypto, linux-kernel, akpm

From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 15 Jul 2007 21:15:57 +0800

> On Sat, Jul 14, 2007 at 11:48:39PM -0700, David Miller wrote:
> > Herbert can you contact the async_tx author to make sure that
> > his crypto/ bits go through you in the future so that conflicts
> > like this can be avoided?
> 
> No problems.  This was a once-off because it involved multiple
> conflicts all over the place as Andrew can no doubt attest to :)

I kind of figured as much since it had dependencies on other
subsystems.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2007-07-16  0:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-07-11 13:08 Crypto Update for 2.6.23 Herbert Xu
2007-07-15  6:48 ` David Miller
2007-07-15 13:15   ` Herbert Xu
2007-07-16  0:35     ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®