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 | d8c02bcc9404b65e8cc290c009bf43f571ec967f (patch) | |
| tree | 3f82cfbf40f036e9cbd62fc5aa6920c63d49a330 /crypto | |
| parent | d84b79d358c3e5a490f8b82641b7f99b52458545 (diff) | |
| download | qemu-d8c02bcc9404b65e8cc290c009bf43f571ec967f.tar.gz | |
crypto: move QCryptoCipherAlgorithm/Mode enum definitions into QAPI
The QCryptoCipherAlgorithm and QCryptoCipherMode enums are
defined in the crypto/cipher.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>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cipher.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/cipher.c b/crypto/cipher.c index d02bb322b7..a24677c97f 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -21,21 +21,21 @@ #include "crypto/cipher.h" -static size_t alg_key_len[QCRYPTO_CIPHER_ALG_LAST] = { +static size_t alg_key_len[QCRYPTO_CIPHER_ALG__MAX] = { [QCRYPTO_CIPHER_ALG_AES_128] = 16, [QCRYPTO_CIPHER_ALG_AES_192] = 24, [QCRYPTO_CIPHER_ALG_AES_256] = 32, [QCRYPTO_CIPHER_ALG_DES_RFB] = 8, }; -static size_t alg_block_len[QCRYPTO_CIPHER_ALG_LAST] = { +static size_t alg_block_len[QCRYPTO_CIPHER_ALG__MAX] = { [QCRYPTO_CIPHER_ALG_AES_128] = 16, [QCRYPTO_CIPHER_ALG_AES_192] = 16, [QCRYPTO_CIPHER_ALG_AES_256] = 16, [QCRYPTO_CIPHER_ALG_DES_RFB] = 8, }; -static bool mode_need_iv[QCRYPTO_CIPHER_MODE_LAST] = { +static bool mode_need_iv[QCRYPTO_CIPHER_MODE__MAX] = { [QCRYPTO_CIPHER_MODE_ECB] = false, [QCRYPTO_CIPHER_MODE_CBC] = true, }; @@ -81,7 +81,7 @@ qcrypto_cipher_validate_key_length(QCryptoCipherAlgorithm alg, size_t nkey, Error **errp) { - if ((unsigned)alg >= QCRYPTO_CIPHER_ALG_LAST) { + if ((unsigned)alg >= QCRYPTO_CIPHER_ALG__MAX) { error_setg(errp, "Cipher algorithm %d out of range", alg); return false; |