diff options
| author | Sean Bruno <sbruno@FreeBSD.org> | 2015-09-02 16:12:36 +0000 |
|---|---|---|
| committer | Sean Bruno <sbruno@FreeBSD.org> | 2015-09-02 16:12:36 +0000 |
| commit | a1606ef6705d978c3a890907fbc93f35c0212b05 (patch) | |
| tree | a88511ccd6173448b1a0eba6d0118f761eaebc90 /emulators/qemu-devel/files/patch-include-qemu-aes.h | |
| parent | Update to 1.20. (diff) | |
QEMU update to 2.4.0
- remove patch files accepted and merge upstream
- Add new vgabios-virtio
Diffstat (limited to 'emulators/qemu-devel/files/patch-include-qemu-aes.h')
| -rw-r--r-- | emulators/qemu-devel/files/patch-include-qemu-aes.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/emulators/qemu-devel/files/patch-include-qemu-aes.h b/emulators/qemu-devel/files/patch-include-qemu-aes.h deleted file mode 100644 index 7c9b8d1d52d9..000000000000 --- a/emulators/qemu-devel/files/patch-include-qemu-aes.h +++ /dev/null @@ -1,18 +0,0 @@ ---- 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, |