2010-03-05 07:10:50

by Herbert Xu

[permalink] [raw]
Subject: Crypto Fixes for 2.6.34

Hi Linus:

This push fixes three regressions and an older bug:

* The new padata system crashes during init on certain configurations.
* Fixed hmac(md5) broken by recent md5 update.
* Fixed authenc broken by ahash conversion.
* Fixed handling of unaligned buffers in hash API.


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


Herbert Xu (1):
crypto: md5 - Set statesize

Steffen Klassert (3):
crypto: authenc - Use correct ahash complete functions
crypto: authenc - Move saved IV in front of the ablkcipher request
padata: Allocate the cpumask for the padata instance

Szilveszter ?rd?g (1):
crypto: hash - Fix handling of unaligned buffers

crypto/ahash.c | 1 -
crypto/authenc.c | 27 +++++++++++++++------------
crypto/md5.c | 1 +
kernel/padata.c | 8 +++++++-
4 files changed, 23 insertions(+), 14 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


2010-04-27 13:55:56

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.34

Hi Linus:

This push fixes an IPsec crash when an async hash driver is used.


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


Herbert Xu (1):
crypto: authenc - Add EINPROGRESS check

crypto/authenc.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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

2010-06-03 10:05:57

by Herbert Xu

[permalink] [raw]
Subject: Crypto Fixes for 2.6.35

Hi Linus:

This push fixes build failures for of_device drivers as well as
a couple of bugs in the n2 driver.


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


Anatolij Gustschin (1):
crypto: crypto4xx - Fix build breakage

David S. Miller (3):
n2_crypto: Fix build after of_device/of_platform_driver changes.
n2_crypto: Fix MAU kmem_cache name.
n2_crypto: Plumb fallback ahash requests properly.

drivers/crypto/amcc/crypto4xx_core.c | 6 +-
drivers/crypto/n2_core.c | 123 ++++++++++++++++++----------------
2 files changed, 68 insertions(+), 61 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

2010-06-03 16:32:38

by Linus Torvalds

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35



On Thu, 3 Jun 2010, Herbert Xu wrote:
>
> Please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git

"Already up-to-date." Forgot to push? (I also checked master, so it's not
that mirroring is slow)

Linus

2010-06-03 21:56:56

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35

On Thu, Jun 03, 2010 at 09:26:38AM -0700, Linus Torvalds wrote:
>
>
> On Thu, 3 Jun 2010, Herbert Xu wrote:
> >
> > Please pull from
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
>
> "Already up-to-date." Forgot to push? (I also checked master, so it's not
> that mirroring is slow)

Sorry, I pushed my tree to my home directory on master but not
to /pub :)

Should work now.

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

2010-07-16 02:26:56

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35

Hi Linus:

This push fixes a crash in the new ablkcipher walking code used by
async block ciphers.


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


Jiri Slaby (1):
crypto: skcipher - avoid NULL dereference

crypto/ablkcipher.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2010-07-22 05:50:50

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35

Hi Linus:

This push fixes a bug in the talito hash driver that causes too
much data to be copied.


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


Lee Nipper (1):
crypto: talitos - fix bug in sg_copy_end_to_buffer

drivers/crypto/talitos.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2010-07-23 05:18:00

by Lee Nipper

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35

On Thu, Jul 22, 2010 at 00:50, Herbert Xu <[email protected]> wrote:
> Hi Linus:
>
> This push fixes a bug in the talito hash driver that causes too
> much data to be copied.
>
>
> 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
>
>
> Lee Nipper (1):
> ? ? ?crypto: talitos - fix bug in sg_copy_end_to_buffer
>
> ?drivers/crypto/talitos.c | ? ?6 +++++-
> ?1 files changed, 5 insertions(+), 1 deletions(-)
>

Thanks Herbert.

But I am curious why this patch

http://www.mail-archive.com/[email protected]/msg04660.html

wasn't nudged along too. It also fixed a talitos problem with ahash.
I don't mind if it needs to wait until later; I'm just curious.

Thanks again,

Lee

2010-07-23 07:27:50

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35

On Fri, Jul 23, 2010 at 12:17:59AM -0500, Lee Nipper wrote:
>
> But I am curious why this patch
>
> http://www.mail-archive.com/[email protected]/msg04660.html
>
> wasn't nudged along too. It also fixed a talitos problem with ahash.
> I don't mind if it needs to wait until later; I'm just curious.

If it causes a crash or has other serious implications then I will
push it. However, if it simply results in a broken hash computation,
a failure that should be fairly obvious, then it can wait til the
next cycle.

When I looked at it previously I thought it fell into the latter
category, but I might be mistaken.

Cheers,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2010-07-23 13:18:01

by Lee Nipper

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35

On Fri, Jul 23, 2010 at 02:27, Herbert Xu <[email protected]> wrote:
> If it causes a crash or has other serious implications then I will
> push it. ?However, if it simply results in a broken hash computation,
> a failure that should be fairly obvious, then it can wait til the
> next cycle.
>
> When I looked at it previously I thought it fell into the latter
> category, but I might be mistaken.

That's right. It's just a hash thing.
Thanks,

Lee

2010-09-03 06:01:02

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35

Hi Linus:

This push fixes a bug in the new ahash walking code, as well as
the self-test disabling option. The self-test disabling options
is now enabled by default as requested.


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


Herbert Xu (2):
crypto: testmgr - Fix test disabling option
crypto: testmgr - Default to no tests

Szilveszter ?rd?g (1):
crypto: hash - Fix handling of small unaligned buffers

crypto/Kconfig | 8 ++++----
crypto/ahash.c | 7 +++++--
crypto/algboss.c | 8 ++++----
crypto/testmgr.c | 4 ++--
4 files changed, 15 insertions(+), 12 deletions(-)

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2010-09-03 11:07:29

by Herbert Xu

[permalink] [raw]
Subject: Crypto Fixes for 2.6.36

On Fri, Sep 03, 2010 at 02:00:55PM +0800, Herbert Xu wrote:
> Hi Linus:
>
> This push fixes a bug in the new ahash walking code, as well as
> the self-test disabling option. The self-test disabling options
> is now enabled by default as requested.

I missed a changeset in the push request. This also includes a
revert of a bogus cast removal patch.


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


Herbert Xu (3):
crypto: testmgr - Fix test disabling option
crypto: testmgr - Default to no tests
Revert "hwrng: n2-drv - remove casts from void*"

Szilveszter ?rd?g (1):
crypto: hash - Fix handling of small unaligned buffers

crypto/Kconfig | 8 ++++----
crypto/ahash.c | 7 +++++--
crypto/algboss.c | 8 ++++----
crypto/testmgr.c | 4 ++--
drivers/char/hw_random/n2-drv.c | 2 +-
5 files changed, 16 insertions(+), 13 deletions(-)

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2010-09-04 10:47:10

by Chuck Ebbert

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35

On Fri, 3 Sep 2010 14:00:55 +0800
Herbert Xu <[email protected]> wrote:

> 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
>
>
> Herbert Xu (2):
> crypto: testmgr - Fix test disabling option
> crypto: testmgr - Default to no tests
>
> Szilveszter Ördög (1):
> crypto: hash - Fix handling of small unaligned buffers
>

What happened to my minor fix?

[ http://marc.info/?l=linux-crypto-vger&m=128311860504202&w=2 ]

I never got a reply about it.

2010-09-04 12:22:56

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.35

On Sat, Sep 04, 2010 at 06:45:01AM -0400, Chuck Ebbert wrote:
> On Fri, 3 Sep 2010 14:00:55 +0800
> Herbert Xu <[email protected]> wrote:
>
> > 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
> >
> >
> > Herbert Xu (2):
> > crypto: testmgr - Fix test disabling option
> > crypto: testmgr - Default to no tests
> >
> > Szilveszter ?rd?g (1):
> > crypto: hash - Fix handling of small unaligned buffers
> >
>
> What happened to my minor fix?
>
> [ http://marc.info/?l=linux-crypto-vger&m=128311860504202&w=2 ]
>
> I never got a reply about it.

Hmm I did send you a reply.

Anyway it's in cryptodev-2.6.

Cheers,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2010-12-15 11:50:46

by Herbert Xu

[permalink] [raw]
Subject: Crypto Fixes for 2.6.37

Hi Linus:

This push fixes a build problem under certain configurations due
to a missing include.


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


Randy Dunlap (1):
crypto: ghash-intel - ghash-clmulni-intel_glue needs err.h

arch/x86/crypto/ghash-clmulni-intel_glue.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2010-12-15 20:40:48

by Linus Torvalds

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.37

On Wed, Dec 15, 2010 at 3:50 AM, Herbert Xu
<[email protected]> wrote:
>
> This push fixes a build problem under certain configurations due
> to a missing include.
>
> Please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git

You have a bad repo. Git says:

fatal: loose object 52f6c5ad430e41736133acac179607b224eaaa11 (stored
in ./objects/52/f6c5ad430e41736133acac179607b224eaaa11) is corrupted

and it doesn't really seem to be corrupt as much as just unreadable
(ie you've made it readable only by yourself).

There's a few other objects like that too. How do you push to your
repo, and what changed?

Linus

2010-12-16 00:49:45

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.37

On Wed, Dec 15, 2010 at 12:40:48PM -0800, Linus Torvalds wrote:
>
> There's a few other objects like that too. How do you push to your
> repo, and what changed?

Oops, I've fixed that now. I use rsync to copy files across so
it's my end that has changed. And indeed I've just done an upgrade.
Sorry.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2010-12-16 00:58:18

by Herbert Xu

[permalink] [raw]
Subject: Re: Crypto Fixes for 2.6.37

On Thu, Dec 16, 2010 at 08:49:38AM +0800, Herbert Xu wrote:
> On Wed, Dec 15, 2010 at 12:40:48PM -0800, Linus Torvalds wrote:
> >
> > There's a few other objects like that too. How do you push to your
> > repo, and what changed?
>
> Oops, I've fixed that now. I use rsync to copy files across so
> it's my end that has changed. And indeed I've just done an upgrade.
> Sorry.

OK it should be fixed for got now. I suspect what has changed
is that git is now using my umask by default.

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2011-02-16 05:39:19

by Herbert Xu

[permalink] [raw]
Subject: Crypto Fixes for 2.6.38

Hi Linus:

This push fixes an ancient bug in s390's implementation of SHA
that manifests itself only under certain conditions. This bug
causes the generation of incorrect hashes, and potentially memory
corruption.

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


Herbert Xu (1):
crypto: sha-s390 - Reset index after processing partial block

arch/s390/crypto/sha_common.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt