From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VldDm-0003bI-P3 for qemu-devel@nongnu.org; Wed, 27 Nov 2013 06:24:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VldDe-0002zx-7A for qemu-devel@nongnu.org; Wed, 27 Nov 2013 06:23:54 -0500 Received: from mail-ie0-x231.google.com ([2607:f8b0:4001:c03::231]:47376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VldDe-0002zj-2K for qemu-devel@nongnu.org; Wed, 27 Nov 2013 06:23:46 -0500 Received: by mail-ie0-f177.google.com with SMTP id tp5so11562724ieb.36 for ; Wed, 27 Nov 2013 03:23:45 -0800 (PST) Sender: Paolo Bonzini Message-ID: <5295D63C.10500@redhat.com> Date: Wed, 27 Nov 2013 12:23:40 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1383928417-38009-1-git-send-email-sson@FreeBSD.org> <1383928417-38009-20-git-send-email-sson@FreeBSD.org> In-Reply-To: <1383928417-38009-20-git-send-email-sson@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 19/19] bsd-user: fix linking conflicts with FreeBSD libcrypto List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stacey Son Cc: qemu-devel@nongnu.org Il 08/11/2013 17:33, Stacey Son ha scritto: > FreeBSD has it's own AES_set_decrypt_key, etc. in libcrypto. This > change fixes these conflicts and allows statically linking BSD > user mode qemu. > > Signed-off-by: Stacey Son > --- > include/qemu/aes.h | 9 +++++++++ > 1 files changed, 9 insertions(+), 0 deletions(-) > > diff --git a/include/qemu/aes.h b/include/qemu/aes.h > index e79c707..6d253a3 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, > What is the error? Do the functions have different signatures or semantics between QEMU and FreeBSD? Paolo