diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-10 16:01:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-10 16:01:35 +0000 |
| commit | 4ffa88c99c54d2a30f79e3dbecec50b023eff1c8 (patch) | |
| tree | 7d34e7b7046f135f433cd4a95b13c9c770e5f50e /crypto/hmac.c | |
| parent | 6058bfb00a7b11559819e50f9aaab3b287fd46cf (diff) | |
| parent | f1710638edb2e98008c2a733ffda63ef32b50411 (diff) | |
| download | focaccia-qemu-4ffa88c99c54d2a30f79e3dbecec50b023eff1c8.tar.gz focaccia-qemu-4ffa88c99c54d2a30f79e3dbecec50b023eff1c8.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-11-08-1' into staging
Merge qcrypto 2017/11/08 v1 # gpg: Signature made Wed 08 Nov 2017 11:06:38 GMT # 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/pull-qcrypto-2017-11-08-1: crypto: afalg: fix a NULL pointer dereference tests: Run the luks tests in test-crypto-block only if encryption is available Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'crypto/hmac.c')
| -rw-r--r-- | crypto/hmac.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/hmac.c b/crypto/hmac.c index 82b0055adf..f6c2d8db60 100644 --- a/crypto/hmac.c +++ b/crypto/hmac.c @@ -90,11 +90,10 @@ QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg, { QCryptoHmac *hmac; void *ctx = NULL; - Error *err2 = NULL; QCryptoHmacDriver *drv = NULL; #ifdef CONFIG_AF_ALG - ctx = qcrypto_afalg_hmac_ctx_new(alg, key, nkey, &err2); + ctx = qcrypto_afalg_hmac_ctx_new(alg, key, nkey, NULL); if (ctx) { drv = &qcrypto_hmac_afalg_driver; } @@ -107,7 +106,6 @@ QCryptoHmac *qcrypto_hmac_new(QCryptoHashAlgorithm alg, } drv = &qcrypto_hmac_lib_driver; - error_free(err2); } hmac = g_new0(QCryptoHmac, 1); |