diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2017-01-30 17:47:11 +0100 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-01-30 18:49:21 +0100 |
| commit | e038c600496109593449613bdf2f0580998b39bf (patch) | |
| tree | e2ed1fafe238890b7e8212903eb8520b7363031a /tools | |
| parent | 4fa8f2a7a1493ebb918a687c4ef587f43084bbf1 (diff) | |
| download | upstream-e038c600496109593449613bdf2f0580998b39bf.tar.gz upstream-e038c600496109593449613bdf2f0580998b39bf.tar.bz2 upstream-e038c600496109593449613bdf2f0580998b39bf.zip | |
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@linux-ipv6.be>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qemu/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
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)" \ |