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

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: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent d84b79d3

crypto/cipher.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

include/crypto/cipher.h

+2 −15
Original line number Diff line number Diff line
@@ -26,21 +26,8 @@ 


typedef struct QCryptoCipher QCryptoCipher;



typedef enum {

    QCRYPTO_CIPHER_ALG_AES_128,

    QCRYPTO_CIPHER_ALG_AES_192,

    QCRYPTO_CIPHER_ALG_AES_256,

    QCRYPTO_CIPHER_ALG_DES_RFB, /* A stupid variant on DES for VNC */



    QCRYPTO_CIPHER_ALG_LAST

} QCryptoCipherAlgorithm;



typedef enum {

    QCRYPTO_CIPHER_MODE_ECB,

    QCRYPTO_CIPHER_MODE_CBC,



    QCRYPTO_CIPHER_MODE_LAST

} QCryptoCipherMode;

/* See also "QCryptoCipherAlgorithm" and "QCryptoCipherMode"

 * enums defined in qapi/crypto.json */



/**

 * QCryptoCipher:

qapi/crypto.json

+30 −0
Original line number Diff line number Diff line
@@ -48,3 +48,33 @@ 
{ 'enum': 'QCryptoHashAlgorithm',

  'prefix': 'QCRYPTO_HASH_ALG',

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





##

# QCryptoCipherAlgorithm:

#

# The supported algorithms for content encryption ciphers

#

# @aes-128: AES with 128 bit / 16 byte keys

# @aes-192: AES with 192 bit / 24 byte keys

# @aes-256: AES with 256 bit / 32 byte keys

# @des-rfb: RFB specific variant of single DES. Do not use except in VNC.

# Since: 2.6

##

{ 'enum': 'QCryptoCipherAlgorithm',

  'prefix': 'QCRYPTO_CIPHER_ALG',

  'data': ['aes-128', 'aes-192', 'aes-256', 'des-rfb']}





##

# QCryptoCipherMode:

#

# The supported modes for content encryption ciphers

#

# @ecb: Electronic Code Book

# @cbc: Cipher Block Chaining

# Since: 2.6

##

{ 'enum': 'QCryptoCipherMode',

  'prefix': 'QCRYPTO_CIPHER_MODE',

  'data': ['ecb', 'cbc']}