Commit c0377a7c authored by Daniel P. Berrangé's avatar Daniel P. Berrangé
Browse files

crypto: ensure qcrypto_hash_digest_len is always defined 



The qcrypto_hash_digest_len method was accidentally inside
a CONFIG_GNUTLS_HASH block, even though it doesn't depend
on gnutls. Re-arrange it to be unconditionally defined.

Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent 9884abee

crypto/hash.c

+17 −13
Original line number Diff line number Diff line
@@ -24,12 +24,8 @@ 
#ifdef CONFIG_GNUTLS_HASH

#include <gnutls/gnutls.h>

#include <gnutls/crypto.h>

#endif



static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {

    [QCRYPTO_HASH_ALG_MD5] = GNUTLS_DIG_MD5,

    [QCRYPTO_HASH_ALG_SHA1] = GNUTLS_DIG_SHA1,

    [QCRYPTO_HASH_ALG_SHA256] = GNUTLS_DIG_SHA256,

};



static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = {

    [QCRYPTO_HASH_ALG_MD5] = 16,
@@ -37,14 +33,6 @@ static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = { 
    [QCRYPTO_HASH_ALG_SHA256] = 32,

};



gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)

{

    if (alg < G_N_ELEMENTS(qcrypto_hash_alg_map)) {

        return true;

    }

    return false;

}



size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg)

{

    if (alg >= G_N_ELEMENTS(qcrypto_hash_alg_size)) {
@@ -54,6 +42,22 @@ size_t qcrypto_hash_digest_len(QCryptoHashAlgorithm alg) 
}





#ifdef CONFIG_GNUTLS_HASH

static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {

    [QCRYPTO_HASH_ALG_MD5] = GNUTLS_DIG_MD5,

    [QCRYPTO_HASH_ALG_SHA1] = GNUTLS_DIG_SHA1,

    [QCRYPTO_HASH_ALG_SHA256] = GNUTLS_DIG_SHA256,

};



gboolean qcrypto_hash_supports(QCryptoHashAlgorithm alg)

{

    if (alg < G_N_ELEMENTS(qcrypto_hash_alg_map)) {

        return true;

    }

    return false;

}





int qcrypto_hash_bytesv(QCryptoHashAlgorithm alg,

                        const struct iovec *iov,

                        size_t niov,