From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfutY-0001Gy-Sf for qemu-devel@nongnu.org; Mon, 11 Nov 2013 12:03:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VfutQ-0000w8-KV for qemu-devel@nongnu.org; Mon, 11 Nov 2013 12:03:24 -0500 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:40892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VfutQ-0000u8-FT for qemu-devel@nongnu.org; Mon, 11 Nov 2013 12:03:16 -0500 From: Stacey Son Date: Fri, 8 Nov 2013 10:33:37 -0600 Message-Id: <1383928417-38009-20-git-send-email-sson@FreeBSD.org> In-Reply-To: <1383928417-38009-1-git-send-email-sson@FreeBSD.org> References: <1383928417-38009-1-git-send-email-sson@FreeBSD.org> In-Reply-To: <1381934232-55158-1-git-send-email-sson@FreeBSD.org> References: <1381934232-55158-1-git-send-email-sson@FreeBSD.org> Subject: [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: qemu-devel@nongnu.org Cc: Stacey Son 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, -- 1.7.8