[source] qemu: rename internal crypto/aes symbols
LEDE Commits
lede-commits at lists.infradead.org
Mon Jan 30 09:48:56 PST 2017
stintel pushed a commit to source.git, branch master:
https://git.lede-project.org/456e1b648161c99c8d2379468842b61feac3be3a
commit 456e1b648161c99c8d2379468842b61feac3be3a
Author: Stijn Tintel <stijn at linux-ipv6.be>
AuthorDate: Mon Jan 30 17:47:11 2017 +0100
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 <stijn at linux-ipv6.be>
---
tools/qemu/Makefile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile
index 783d0f9..3eac66f 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)" \
More information about the lede-commits
mailing list