From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwwYi-0007jy-Ie for qemu-devel@nongnu.org; Tue, 17 Jun 2014 12:48:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwwYa-0003cI-TB for qemu-devel@nongnu.org; Tue, 17 Jun 2014 12:48:32 -0400 Received: from ignoranthack.me ([199.102.79.106]:51463 helo=mail.ignoranthack.me) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwwYa-0003c9-OX for qemu-devel@nongnu.org; Tue, 17 Jun 2014 12:48:24 -0400 Received: from [192.168.200.204] (c-50-131-5-126.hsd1.ca.comcast.net [50.131.5.126]) (using SSLv3 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: sbruno@ignoranthack.me) by mail.ignoranthack.me (Postfix) with ESMTPSA id 2EE9E1936DE for ; Tue, 17 Jun 2014 16:48:23 +0000 (UTC) From: Sean Bruno In-Reply-To: <1402930927-41125-1-git-send-email-sbruno@freebsd.org> References: <1402930927-41125-1-git-send-email-sbruno@freebsd.org> Content-Type: text/plain; charset="us-ascii" Date: Tue, 17 Jun 2014 09:48:21 -0700 Message-ID: <1403023701.39699.9.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel 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 > Signed-off-by: Ed Maste > --- > 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