diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-13 13:05:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-13 13:05:02 +0100 |
| commit | 55e5c3a2d2433bd2e1e635a7ba395f1c70341794 (patch) | |
| tree | cfb8799987f9e2b1d26441cd985fe8d11df4a910 /include | |
| parent | 8fdf038722a00693e68b4f76a66d39781572c3ec (diff) | |
| parent | c8d70e59738e672021926c7747af8ef9dea15c82 (diff) | |
| download | qemu-55e5c3a2d2433bd2e1e635a7ba395f1c70341794.zip qemu-55e5c3a2d2433bd2e1e635a7ba395f1c70341794.tar.gz qemu-55e5c3a2d2433bd2e1e635a7ba395f1c70341794.tar.bz2 | |
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-2016-06-13-v1' into staging
Merge qcrypto-next 2016/06/13 v1
# gpg: Signature made Mon 13 Jun 2016 12:43:22 BST
# gpg: using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/qcrypto-next-2016-06-13-v1:
crypto: aes: always rename internal symbols
crypto: assert that qcrypto_hash_digest_len is in range
crypto: remove temp files on completion of secrets test
TLS: provide slightly more information when TLS certificate loading fails
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/aes.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/crypto/aes.h b/include/crypto/aes.h index a006da2..12fb321 100644 --- a/include/crypto/aes.h +++ b/include/crypto/aes.h @@ -10,14 +10,13 @@ struct aes_key_st { }; typedef struct aes_key_st AES_KEY; -/* FreeBSD has its own AES_set_decrypt_key in -lcrypto, avoid conflicts */ -#ifdef __FreeBSD__ +/* FreeBSD/OpenSSL have their own AES functions with the same names in -lcrypto + * (which might be pulled in via curl), so redefine to avoid conflicts. */ #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); |