mirror of
https://git.freebsd.org/ports.git
synced 2025-05-12 23:31:50 -04:00
ec69b9504e
https://lists.gnu.org/archive/html/qemu-devel/2013-06/msg04798.html - Simplify bsd-user ld script handling. [1] - Make STATIC_LINK work again. - Add GTK knob. - Neither graphical UI can be built static, set IGNORE in that case. - Properly fix AES_* link errors by #defining those functions as QEMU_AES_* to avoid conflicts with AES_* in -lcrypto needed (at least) by -lcurl. - Add back CURL knob in the process. - Fix "Warning: vlan %d is not connected to host network" when using pcap. - Switch to USES= gmake. - Note: I did not backport sson's latest bsd-user patches which he has now in a github tree based on qemu git head, tho I have a seperate port of that tree on redports: svn co https://svn.redports.org/nox/emulators/qemu-devel-sson/ See also: https://wiki.freebsd.org/QemuUserModeHowTo Submitted by: emaste [1]
18 lines
627 B
C
18 lines
627 B
C
--- 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,
|