linux-kernel - Re: [PATCH v5 0/3] crypto: KEYS: convert public key to akcipher api

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <12277.1454805833@warthog.procyon.org.uk>
Date:	Sun, 07 Feb 2016 00:43:53 +0000
From:	David Howells <dhowells@...hat.com>
To:	Herbert Xu <herbert@...dor.apana.org.au>
Cc:	dhowells@...hat.com, jmorris@...ei.org,
	Tadeusz Struk <tadeusz.struk@...el.com>,
	linux-kernel@...r.kernel.org,
	linux-security-module@...r.kernel.org,
	linux-crypto@...r.kernel.org, zohar@...ux.vnet.ibm.com
Subject: Re: [PATCH v5 0/3] crypto: KEYS: convert public key to akcipher api

Herbert Xu <herbert@...dor.apana.org.au> wrote:

> > Hmmm...  That means that the crypto branch and the security branch are going
> > to conflict.
> 
> I thought you were OK with it going in now as you said that you'll
> fix it up later.  Sorry for the misunderstanding.  Do you want me to
> revert?

Ummm.  I did say I'd take it on top of my patches.  How did you take it?  Did
you merge Tadeusz's branch?  If so, I can probably merge it into mine also and
git will Just Do The Right Thing™.

David