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/hash.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/hash.c')
| -rw-r--r-- | crypto/hash.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/crypto/hash.c b/crypto/hash.c index ac59c63d5f..8dab25d9ea 100644 --- a/crypto/hash.c +++ b/crypto/hash.c @@ -48,19 +48,16 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg, { #ifdef CONFIG_AF_ALG int ret; - + /* + * TODO: + * Maybe we should treat some afalg errors as fatal + */ ret = qcrypto_hash_afalg_driver.hash_bytesv(alg, iov, niov, result, resultlen, - errp); + NULL); if (ret == 0) { return ret; } - - /* - * TODO: - * Maybe we should treat some afalg errors as fatal - */ - error_free(*errp); #endif return qcrypto_hash_lib_driver.hash_bytesv(alg, iov, niov, |