diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2015-11-19 17:09:01 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2015-12-23 11:02:20 +0000 |
| commit | d84b79d358c3e5a490f8b82641b7f99b52458545 (patch) | |
| tree | ca8c21261c0d771fe1e871730e37f9d3ab62964d | |
| parent | 7b36064c90c377d07d30904318d6cbfe5a133af1 (diff) | |
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: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
| -rw-r--r-- | crypto/hash.c | 4 | ||||
| -rw-r--r-- | include/crypto/hash.h | 9 | ||||
| -rw-r--r-- | qapi/crypto.json | 15 |
3 files changed, 18 insertions, 10 deletions
diff --git a/crypto/hash.c b/crypto/hash.c index 5a47b90ec0..6e83f43e4a 100644 --- a/crypto/hash.c +++ b/crypto/hash.c @@ -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, diff --git a/include/crypto/hash.h b/include/crypto/hash.h index 3d1812442f..41822c0a4e 100644 --- a/include/crypto/hash.h +++ b/include/crypto/hash.h @@ -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: diff --git a/qapi/crypto.json b/qapi/crypto.json index 4012659169..0706ded59d 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -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']} |