From c25fbbec686612b08f5122af3941e7b663ee53a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
Date: Tue, 15 May 2018 09:58:50 +0200
Subject: [PATCH] virCryptoHashBuf: return the length of the hash in bytes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

virCryptoHashString also needs to know the size of the returned hash.
Return it if the hash conversion succeeded so the caller does not need
to access the hashinfo array.

This should make virCryptoHashString build without gnutls.
Also fixes the missing return value for the virCryptoHashBuf stub.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Suggested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 src/util/vircrypto.c | 14 ++++++++------
 src/util/vircrypto.h |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c
index 62a027353b..d110adfe59 100644
--- a/src/util/vircrypto.c
+++ b/src/util/vircrypto.c
@@ -54,7 +54,7 @@ struct virHashInfo {
 
 verify(ARRAY_CARDINALITY(hashinfo) == VIR_CRYPTO_HASH_LAST);
 
-int
+ssize_t
 virCryptoHashBuf(virCryptoHash hash,
                  const char *input,
                  unsigned char *output)
@@ -74,16 +74,17 @@ virCryptoHashBuf(virCryptoHash hash,
         return -1;
     }
 
-    return 0;
+    return hashinfo[hash].hashlen;
 }
 #else
-int
+ssize_t
 virCryptoHashBuf(virCryptoHash hash,
                  const char *input ATTRIBUTE_UNUSED,
                  unsigned char *output ATTRIBUTE_UNUSED)
 {
     virReportError(VIR_ERR_INVALID_ARG,
                    _("algorithm=%d is not supported"), hash);
+    return -1;
 }
 #endif
 
@@ -93,18 +94,19 @@ virCryptoHashString(virCryptoHash hash,
                     char **output)
 {
     unsigned char buf[VIR_CRYPTO_LARGEST_DIGEST_SIZE];
+    ssize_t rc;
     size_t hashstrlen;
     size_t i;
 
-    if (virCryptoHashBuf(hash, input, buf) < 0)
+    if ((rc = virCryptoHashBuf(hash, input, buf)) < 0)
         return -1;
 
-    hashstrlen = (hashinfo[hash].hashlen * 2) + 1;
+    hashstrlen = (rc * 2) + 1;
 
     if (VIR_ALLOC_N(*output, hashstrlen) < 0)
         return -1;
 
-    for (i = 0; i < hashinfo[hash].hashlen; i++) {
+    for (i = 0; i < rc; i++) {
         (*output)[i * 2] = hex[(buf[i] >> 4) & 0xf];
         (*output)[(i * 2) + 1] = hex[buf[i] & 0xf];
     }
diff --git a/src/util/vircrypto.h b/src/util/vircrypto.h
index 64984006be..9b5dada53d 100644
--- a/src/util/vircrypto.h
+++ b/src/util/vircrypto.h
@@ -41,7 +41,7 @@ typedef enum {
     VIR_CRYPTO_CIPHER_LAST
 } virCryptoCipher;
 
-int
+ssize_t
 virCryptoHashBuf(virCryptoHash hash,
                  const char *input,
                  unsigned char *output)
-- 
GitLab