[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 3/6] crypto: move QCryptoHashAlgorithm enum defi
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PATCH 3/6] crypto: move QCryptoHashAlgorithm enum definition into QAPI |
Date: |
Mon, 21 Dec 2015 09:27:15 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 |
On 12/21/2015 09:06 AM, Daniel P. Berrange wrote:
> 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.
>
> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
> crypto/hash.c | 4 ++--
> include/crypto/hash.h | 9 +--------
> qapi/crypto.json | 15 +++++++++++++++
> 3 files changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/crypto/hash.c b/crypto/hash.c
> index 5a47b90..b5f81c4 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] = {
Will need rebasing, now that commit 7fb1cf1 has landed and renamed it
QCRYPTO_HASH_ALG__MAX.
> +++ 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']}
Otherwise looks fine. I know Markus is debating about getting rid of use
of 'prefix', and this just makes that task harder, but the current
munging would produce Q_CRYPTO_... even if you named the enum
QCryptoHashAlg, so I'm okay with it.
Reviewed-by: Eric Blake <address@hidden>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
- [Qemu-devel] [PATCH 2/6] crypto: add ability to query hash digest len, (continued)
- [Qemu-devel] [PATCH 2/6] crypto: add ability to query hash digest len, Daniel P. Berrange, 2015/12/21
- [Qemu-devel] [PATCH 4/6] crypto: move QCryptoCipherAlgorithm/Mode enum definitions into QAPI, Daniel P. Berrange, 2015/12/21
- [Qemu-devel] [PATCH 5/6] crypto: ensure qapi/crypto.json is listed in qapi-modules, Daniel P. Berrange, 2015/12/21
- [Qemu-devel] [PATCH 6/6] crypto: fix transposed arguments in cipher error message, Daniel P. Berrange, 2015/12/21
- [Qemu-devel] [PATCH 3/6] crypto: move QCryptoHashAlgorithm enum definition into QAPI, Daniel P. Berrange, 2015/12/21
- Re: [Qemu-devel] [PATCH 3/6] crypto: move QCryptoHashAlgorithm enum definition into QAPI,
Eric Blake <=