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

crypto: move QCryptoHashAlgorithm enum definition into QAPI 



The QCryptoHashAlgorithm enum is defined in the crypto/hash.h
header. In the future some QAPI types will want to reference
the hash enums, so move the enum definition into QAPI too.

Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent 7b36064c

crypto/hash.c

+2 −2
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 
#include <gnutls/gnutls.h>

#include <gnutls/crypto.h>



static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG_LAST] = {

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_LAST] = {

static size_t qcrypto_hash_alg_size[QCRYPTO_HASH_ALG__MAX] = {

    [QCRYPTO_HASH_ALG_MD5] = 16,

    [QCRYPTO_HASH_ALG_SHA1] = 20,

    [QCRYPTO_HASH_ALG_SHA256] = 32,

include/crypto/hash.h

+1 −8
Original line number Diff line number Diff line
@@ -24,14 +24,7 @@ 
#include "qemu-common.h"

#include "qapi/error.h"



typedef enum {

    QCRYPTO_HASH_ALG_MD5,

    QCRYPTO_HASH_ALG_SHA1,

    QCRYPTO_HASH_ALG_SHA256,



    QCRYPTO_HASH_ALG_LAST

} QCryptoHashAlgorithm;



/* See also "QCryptoHashAlgorithm" defined in qapi/crypto.json */



/**

 * qcrypto_hash_supports:

qapi/crypto.json

+15 −0
Original line number Diff line number Diff line
@@ -33,3 +33,18 @@ 
{ 'enum': 'QCryptoSecretFormat',

  'prefix': 'QCRYPTO_SECRET_FORMAT',

  'data': ['raw', 'base64']}





##

# QCryptoHashAlgorithm:

#

# The supported algorithms for computing content digests

#

# @md5: MD5. Should not be used in any new code, legacy compat only

# @sha1: SHA-1. Should not be used in any new code, legacy compat only

# @sha256: SHA-256. Current recommended strong hash.

# Since: 2.6

##

{ 'enum': 'QCryptoHashAlgorithm',

  'prefix': 'QCRYPTO_HASH_ALG',

  'data': ['md5', 'sha1', 'sha256']}