From 456e1b648161c99c8d2379468842b61feac3be3a Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Mon, 30 Jan 2017 17:47:11 +0100 Subject: [PATCH] qemu: rename internal crypto/aes symbols Qemu's local AES code defines symbols that conflict with LibreSSL/OpenSSL's libcrypto. Rename them to avoid build problems. See upstream commit c8d70e59738e672021926c7747af8ef9dea15c82. Fixes FS#444. Signed-off-by: Stijn Tintel --- tools/qemu/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile index 783d0f9fad..3eac66f01e 100644 --- a/tools/qemu/Makefile +++ b/tools/qemu/Makefile @@ -16,7 +16,13 @@ PKG_HASH:=33ceae3fbe516f2cbb151dc98d16c8ccfec74b1056674ad715e75a2f7fed45c3 include $(INCLUDE_DIR)/host-build.mk -HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs +HOST_CFLAGS += \ + -I$(STAGING_DIR_HOST)/include/e2fsprogs \ + -DAES_cbc_encrypt=QEMU_AES_cbc_encrypt \ + -DAES_decrypt=QEMU_AES_decrypt \ + -DAES_encrypt=QEMU_AES_encrypt \ + -DAES_set_decrypt_key=QEMU_AES_set_decrypt_key \ + -DAES_set_encrypt_key=QEMU_AES_set_encrypt_key HOST_CONFIGURE_VARS := \ CFLAGS="$(HOST_CFLAGS)" \ -- 2.25.1