| Message ID | 1467736993-20552-1-git-send-email-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/05/2016 10:43 AM, Daniel P. Berrange wrote: > Call the existing qcrypto_hash_supports method from > qcrypto_hash_bytesv instead of open-coding it again. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > crypto/hash-gcrypt.c | 3 +-- > crypto/hash-glib.c | 3 +-- > crypto/hash-nettle.c | 3 +-- > 3 files changed, 3 insertions(+), 6 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On Tue 05 Jul 2016 06:43:13 PM CEST, "Daniel P. Berrange" <berrange@redhat.com> wrote: > Call the existing qcrypto_hash_supports method from > qcrypto_hash_bytesv instead of open-coding it again. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> "PATCH 3/2" ? :-) Reviewed-by: Alberto Garcia <berto@igalia.com> Berto
diff --git a/crypto/hash-gcrypt.c b/crypto/hash-gcrypt.c index 8ea5aff..0dad13d 100644 --- a/crypto/hash-gcrypt.c +++ b/crypto/hash-gcrypt.c @@ -55,8 +55,7 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg, gcry_md_hd_t md; unsigned char *digest; - if (alg >= G_N_ELEMENTS(qcrypto_hash_alg_map) || - qcrypto_hash_alg_map[alg] == GCRY_MD_NONE) { + if (!qcrypto_hash_supports(alg)) { error_setg(errp, "Unknown hash algorithm %d", alg); diff --git a/crypto/hash-glib.c b/crypto/hash-glib.c index 81ef7ca..ce54a4b 100644 --- a/crypto/hash-glib.c +++ b/crypto/hash-glib.c @@ -53,8 +53,7 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg, int i, ret; GChecksum *cs; - if (alg >= G_N_ELEMENTS(qcrypto_hash_alg_map) || - qcrypto_hash_alg_map[alg] == -1) { + if (!qcrypto_hash_supports(alg)) { error_setg(errp, "Unknown hash algorithm %d", alg); diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c index 4c6f50b..6a206dc 100644 --- a/crypto/hash-nettle.c +++ b/crypto/hash-nettle.c @@ -113,8 +113,7 @@ int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg, int i; union qcrypto_hash_ctx ctx; - if (alg >= G_N_ELEMENTS(qcrypto_hash_alg_map) || - qcrypto_hash_alg_map[alg].init == NULL) { + if (!qcrypto_hash_supports(alg)) { error_setg(errp, "Unknown hash algorithm %d", alg);
Call the existing qcrypto_hash_supports method from qcrypto_hash_bytesv instead of open-coding it again. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- crypto/hash-gcrypt.c | 3 +-- crypto/hash-glib.c | 3 +-- crypto/hash-nettle.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)