diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 17:57:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-08-22 17:57:09 +0100 |
| commit | 3590b27c7a2be7a24b4b265e2e9458b3761103e1 (patch) | |
| tree | c4f94fe22dc14be0929494f0c9688ab4a84c65fd /crypto/hmac-glib.c | |
| parent | d013d220c710054a6d755941460f88c186fef7b5 (diff) | |
| parent | 57b9f113fce2a2231a47e9295c1d461e9ff7f0f7 (diff) | |
| download | qemu-3590b27c7a2be7a24b4b265e2e9458b3761103e1.zip qemu-3590b27c7a2be7a24b4b265e2e9458b3761103e1.tar.gz qemu-3590b27c7a2be7a24b4b265e2e9458b3761103e1.tar.bz2 | |
Merge remote-tracking branch 'remotes/berrange/tags/autofree-pull-request' into staging
require newer glib2 to enable autofree'ing of stack variables exiting scope
* Bump minium glib2 version to 2.48
* Convert much of the crypto code to use automatic memory free functions
# gpg: Signature made Thu 22 Aug 2019 11:51:59 BST
# gpg: using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/autofree-pull-request:
crypto: use auto cleanup for many stack variables
crypto: define cleanup functions for use with g_autoptr
glib: bump min required glib library version to 2.48
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'crypto/hmac-glib.c')
| -rw-r--r-- | crypto/hmac-glib.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/crypto/hmac-glib.c b/crypto/hmac-glib.c index 7df6273..509bbc7 100644 --- a/crypto/hmac-glib.c +++ b/crypto/hmac-glib.c @@ -21,12 +21,7 @@ static int qcrypto_hmac_alg_map[QCRYPTO_HASH_ALG__MAX] = { [QCRYPTO_HASH_ALG_MD5] = G_CHECKSUM_MD5, [QCRYPTO_HASH_ALG_SHA1] = G_CHECKSUM_SHA1, [QCRYPTO_HASH_ALG_SHA256] = G_CHECKSUM_SHA256, -/* Support for HMAC SHA-512 in GLib 2.42 */ -#if GLIB_CHECK_VERSION(2, 42, 0) [QCRYPTO_HASH_ALG_SHA512] = G_CHECKSUM_SHA512, -#else - [QCRYPTO_HASH_ALG_SHA512] = -1, -#endif [QCRYPTO_HASH_ALG_SHA224] = -1, [QCRYPTO_HASH_ALG_SHA384] = -1, [QCRYPTO_HASH_ALG_RIPEMD160] = -1, |