mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: Switch to QEMU UUID API

Browse Source 
The uuid generation doesn't return error, so update the function
signature and calling code accordingly.

Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-Id: <1474432046-325-7-git-send-email-famz@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Fam Zheng 2016-09-21 12:27:19 +08:00
parent 38440a21fa
commit 2ef950f91d
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crypto/block-luks.c
View File

@ -29,10 +29,7 @@
#include "crypto/pbkdf.h" #include "crypto/pbkdf.h"
#include "crypto/secret.h" #include "crypto/secret.h"
#include "crypto/random.h" #include "crypto/random.h"
#include "qemu/uuid.h"
#ifdef CONFIG_UUID
#include <uuid/uuid.h>
#endif
#include "qemu/coroutine.h" #include "qemu/coroutine.h"
@ -877,18 +874,12 @@ qcrypto_block_luks_open(QCryptoBlock *block,
} }
static int static void
qcrypto_block_luks_uuid_gen(uint8_t *uuidstr, Error **errp) qcrypto_block_luks_uuid_gen(uint8_t *uuidstr)
{ {
#ifdef CONFIG_UUID QemuUUID uuid;
uuid_t uuid; qemu_uuid_generate(&uuid);
uuid_generate(uuid); qemu_uuid_unparse(&uuid, (char *)uuidstr);
uuid_unparse(uuid, (char *)uuidstr);
return 0;
#else
error_setg(errp, "Unable to generate uuids on this platform");
return -1;
#endif
} }
static int static int
@ -965,10 +956,7 @@ qcrypto_block_luks_create(QCryptoBlock *block,
* it out to disk * it out to disk
*/ */
luks->header.version = QCRYPTO_BLOCK_LUKS_VERSION; luks->header.version = QCRYPTO_BLOCK_LUKS_VERSION;
if (qcrypto_block_luks_uuid_gen(luks->header.uuid, qcrypto_block_luks_uuid_gen(luks->header.uuid);
errp) < 0) {
goto error;
}
cipher_alg = qcrypto_block_luks_cipher_alg_lookup(luks_opts.cipher_alg, cipher_alg = qcrypto_block_luks_cipher_alg_lookup(luks_opts.cipher_alg,
errp); errp);