Commit 9ae33079 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup() 



Cc: "Daniel P. Berrange" <berrange@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1503564371-26090-10-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: default avatarDaniel P. Berrange <berrange@redhat.com>
parent 8d5fb199

crypto/block-luks.c

+7 −12
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qapi/util.h"

#include "qemu/bswap.h"



#include "crypto/block-luks.h"
@@ -265,39 +266,33 @@ qcrypto_block_luks_cipher_alg_lookup(QCryptoCipherAlgorithm alg, 
 * make that function emit a more friendly error message */

static int qcrypto_block_luks_name_lookup(const char *name,

                                          const char *const *map,

                                          size_t maplen,

                                          const char *type,

                                          Error **errp)

{

    size_t i;

    for (i = 0; i < maplen; i++) {

        if (g_str_equal(map[i], name)) {

            return i;

        }

    }

    int ret = qapi_enum_parse(map, name, -1, NULL);



    if (ret < 0) {

        error_setg(errp, "%s %s not supported", type, name);

        return 0;

    }

    return ret;

}



#define qcrypto_block_luks_cipher_mode_lookup(name, errp)               \

    qcrypto_block_luks_name_lookup(name,                                \

                                   QCryptoCipherMode_lookup,            \

                                   QCRYPTO_CIPHER_MODE__MAX,            \

                                   "Cipher mode",                       \

                                   errp)



#define qcrypto_block_luks_hash_name_lookup(name, errp)                 \

    qcrypto_block_luks_name_lookup(name,                                \

                                   QCryptoHashAlgorithm_lookup,         \

                                   QCRYPTO_HASH_ALG__MAX,               \

                                   "Hash algorithm",                    \

                                   errp)



#define qcrypto_block_luks_ivgen_name_lookup(name, errp)                \

    qcrypto_block_luks_name_lookup(name,                                \

                                   QCryptoIVGenAlgorithm_lookup,        \

                                   QCRYPTO_IVGEN_ALG__MAX,              \

                                   "IV generator",                      \

                                   errp)