From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwHLB-0000Vz-O6 for qemu-devel@nongnu.org; Sun, 15 Jun 2014 16:47:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwHL0-0001qr-78 for qemu-devel@nongnu.org; Sun, 15 Jun 2014 16:47:49 -0400 Received: from ignoranthack.me ([199.102.79.106]:62999 helo=mail.ignoranthack.me) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwHL0-0001qZ-2K for qemu-devel@nongnu.org; Sun, 15 Jun 2014 16:47:38 -0400 From: Sean Bruno Date: Sun, 15 Jun 2014 13:47:31 -0700 Message-Id: <1402865252-25671-3-git-send-email-sbruno@freebsd.org> In-Reply-To: <1402865252-25671-1-git-send-email-sbruno@freebsd.org> References: <1402865252-25671-1-git-send-email-sbruno@freebsd.org> Subject: [Qemu-devel] [PATCH 2/3 v2] bsd-user: Add patches to fix AES_* link errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sean Bruno 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, -- 1.9.3