From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42473)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sbruno@ignoranthack.me>) id 1WxcaB-00084R-FV
	for qemu-devel@nongnu.org; Thu, 19 Jun 2014 09:40:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <sbruno@ignoranthack.me>) id 1Wxca1-0005Os-7k
	for qemu-devel@nongnu.org; Thu, 19 Jun 2014 09:40:51 -0400
Received: from ignoranthack.me ([199.102.79.106]:50896
	helo=mail.ignoranthack.me) by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sbruno@ignoranthack.me>) id 1Wxca1-0005Ob-12
	for qemu-devel@nongnu.org; Thu, 19 Jun 2014 09:40:41 -0400
From: Sean Bruno <sbruno@ignoranthack.me>
In-Reply-To: <1403023701.39699.9.camel@bruno>
References: <1402930927-41125-1-git-send-email-sbruno@freebsd.org>
	<1403023701.39699.9.camel@bruno>
Content-Type: text/plain; charset="us-ascii"
Date: Thu, 19 Jun 2014 06:40:37 -0700
Message-ID: <1403185237.43097.6.camel@bruno>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v3] bsd-user: Add patches to fix AES_* link
 errors
Reply-To: sbruno@freebsd.org
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: sbruno@freebsd.org
Cc: qemu-devel <qemu-devel@nongnu.org>

On Tue, 2014-06-17 at 09:48 -0700, Sean Bruno wrote:
> On Mon, 2014-06-16 at 08:02 -0700, Sean Bruno wrote:
> > v3
> >  Drop patch1 as it has been superceeded
> >  Drop patch3 as it doesn't belong in this patchset
> > 
> > v2
> >  Correct email address for Ed Maste
> > 
> > Redefine functions as QEMU_AES_* to avoid conflicts with AES_* in
> > -lcrypto needed (at least) by -lcurl.
> > 
> > Take from emulators/qemu-devel/files/patch-include-qemu-aes.h
> > 
> > Signed-off-by: Sean Bruno <sbruno@freebsd.org>
> > Signed-off-by: Ed Maste <emaste@freebsd.org>
> > ---
> >  include/qemu/aes.h | 9 +++++++++
> >  1 file changed, 9 insertions(+)
> > 
> > diff --git a/include/qemu/aes.h b/include/qemu/aes.h
> > index e79c707..d310411 100644
> > --- a/include/qemu/aes.h
> > +++ b/include/qemu/aes.h
> > @@ -10,6 +10,15 @@ struct aes_key_st {
> >  };
> >  typedef struct aes_key_st AES_KEY;
> >  
> > +/* FreeBSD has it's own AES_set_decrypt_key in -lcrypto, avoid conflicts */
> > +#ifdef __FreeBSD__
> > +#define AES_set_encrypt_key QEMU_AES_set_encrypt_key
> > +#define AES_set_decrypt_key QEMU_AES_set_decrypt_key
> > +#define AES_encrypt QEMU_AES_encrypt
> > +#define AES_decrypt QEMU_AES_decrypt
> > +#define AES_cbc_encrypt QEMU_AES_cbc_encrypt
> > +#endif
> > +
> >  int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
> >  	AES_KEY *key);
> >  int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
> 
> 
> Ping.  This fixes an in tree link failure for bsd-user.
> 
> sean
> 
> 

Ping x2.  This fixes an in tree link failure for bsd-user.


sean