From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBhM8-0006qU-Jr for qemu-devel@nongnu.org; Wed, 23 Dec 2015 06:13:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBhM6-0006Yw-Tf for qemu-devel@nongnu.org; Wed, 23 Dec 2015 06:13:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47240) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBhM6-0006Yq-OT for qemu-devel@nongnu.org; Wed, 23 Dec 2015 06:13:18 -0500 From: "Daniel P. Berrange" Date: Wed, 23 Dec 2015 11:13:05 +0000 Message-Id: <1450869189-31281-3-git-send-email-berrange@redhat.com> In-Reply-To: <1450869189-31281-1-git-send-email-berrange@redhat.com> References: <1450869189-31281-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PULL v1 2/6] crypto: add ability to query hash digest len List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell Add a qcrypto_hash_digest_len() method which allows querying of the raw digest size for a given hash algorithm. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange --- crypto/hash.c | 15 +++++++++++++++ include/crypto/hash.h | 11 +++++++++++ tests/test-crypto-hash.c | 5 +++++ 3 files changed, 31 insertions(+) diff --git a/crypto/hash.c b/crypto/hash.c index 81e74de..5a47b90 100644 --- a/crypto/hash.c +++ b/crypto/hash.c @@ -30,6 +30,12 @@ static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG_LAST] = { [QCRYPTO_HASH_ALG_SHA256] = GNUTLS_DIG_SHA256, }; +static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG_LAST] = { + [QCRYPTO_HASH_ALG_MD5] = 16, + [QCRYPTO_HASH_ALG_SHA1] = 20, + [QCRYPTO_HASH_ALG_SHA256] = 32, +}; + gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg) { if (alg < G_N_ELEMENTS(qcrypto_hash_alg_map)) { @@ -38,6 +44,15 @@ gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg) return false; } +size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg) +{ + if (alg >= G_N_ELEMENTS(qcrypto_hash_alg_size)) { + return 0; + } + return qcrypto_hash_alg_size[alg]; +} + + int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg, const struct iovec *iov, size_t niov, diff --git a/include/crypto/hash.h b/include/crypto/hash.h index b5acbf6..3d18124 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h @@ -44,6 +44,17 @@ typedef enum { */ gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg); + +/** + * qcrypto_hash_digest_len: + * @alg: the hash algorithm + * + * Determine the size of the hash digest in bytes + * + * Returns: the digest length in bytes + */ +size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg); + /** * qcrypto_hash_bytesv: * @alg: the hash algorithm diff --git a/tests/test-crypto-hash.c b/tests/test-crypto-hash.c index 911437e..3ec31dd 100644 --- a/tests/test-crypto-hash.c +++ b/tests/test-crypto-hash.c @@ -163,6 +163,11 @@ static void test_hash_digest(void) for (i = 0; i < G_N_ELEMENTS(expected_outputs) ; i++) { int ret; char *digest; + size_t digestsize; + + digestsize = qcrypto_hash_digest_len(i); + + g_assert_cmpint(digestsize * 2, ==, strlen(expected_outputs[i])); ret = qcrypto_hash_digest(i, INPUT_TEXT, -- 2.5.0