35286daeca
Even though a LUKS header might be created with cryptsetup,
qemu-img should be enhanced to accommodate it as well.
Add the 'detached-header' option to specify the creation of
a detached LUKS header. This is how it is used:
$ qemu-img create --object secret,id=sec0,data=abc123 -f luks
> -o cipher-alg=aes-256,cipher-mode=xts -o key-secret=sec0
> -o detached-header=true header.luks
Using qemu-img or cryptsetup tools to query information of
an LUKS header image as follows:
Assume a detached LUKS header image has been created by:
$ dd if=/dev/zero of=test-header.img bs=1M count=32
$ dd if=/dev/zero of=test-payload.img bs=1M count=1000
$ cryptsetup luksFormat --header test-header.img test-payload.img
> --force-password --type luks1
Header image information could be queried using cryptsetup:
$ cryptsetup luksDump test-header.img
or qemu-img:
$ qemu-img info 'json:{"driver":"luks","file":{"filename":
> "test-payload.img"},"header":{"filename":"test-header.img"}}'
When using qemu-img, keep in mind that the entire disk
information specified by the JSON-format string above must be
supplied on the commandline; if not, an overlay check will reveal
a problem with the LUKS volume check logic.
Signed-off-by: Hyman Huang <yong.huang@smartx.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
[changed to pass 'cflags' to block_crypto_co_create_generic]
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
143 lines
6.1 KiB
C
143 lines
6.1 KiB
C
/*
|
|
* QEMU block full disk encryption
|
|
*
|
|
* Copyright (c) 2015-2017 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#ifndef BLOCK_CRYPTO_H
|
|
#define BLOCK_CRYPTO_H
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, helpstr) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_QCOW_KEY_SECRET, \
|
|
.type = QEMU_OPT_STRING, \
|
|
.help = helpstr, \
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_QCOW_KEY_SECRET "key-secret"
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_QCOW_KEY_SECRET(prefix) \
|
|
BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, \
|
|
"ID of the secret that provides the AES encryption key")
|
|
|
|
#define BLOCK_CRYPTO_OPT_LUKS_KEY_SECRET "key-secret"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_CIPHER_ALG "cipher-alg"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_CIPHER_MODE "cipher-mode"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_IVGEN_ALG "ivgen-alg"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_IVGEN_HASH_ALG "ivgen-hash-alg"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_HASH_ALG "hash-alg"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_ITER_TIME "iter-time"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_DETACHED_HEADER "detached-header"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_KEYSLOT "keyslot"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_STATE "state"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_OLD_SECRET "old-secret"
|
|
#define BLOCK_CRYPTO_OPT_LUKS_NEW_SECRET "new-secret"
|
|
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_KEY_SECRET(prefix) \
|
|
BLOCK_CRYPTO_OPT_DEF_KEY_SECRET(prefix, \
|
|
"ID of the secret that provides the keyslot passphrase")
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_CIPHER_ALG(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_CIPHER_ALG, \
|
|
.type = QEMU_OPT_STRING, \
|
|
.help = "Name of encryption cipher algorithm", \
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_CIPHER_MODE(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_CIPHER_MODE, \
|
|
.type = QEMU_OPT_STRING, \
|
|
.help = "Name of encryption cipher mode", \
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_IVGEN_ALG(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_IVGEN_ALG, \
|
|
.type = QEMU_OPT_STRING, \
|
|
.help = "Name of IV generator algorithm", \
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_IVGEN_HASH_ALG(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_IVGEN_HASH_ALG, \
|
|
.type = QEMU_OPT_STRING, \
|
|
.help = "Name of IV generator hash algorithm", \
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_HASH_ALG(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_HASH_ALG, \
|
|
.type = QEMU_OPT_STRING, \
|
|
.help = "Name of encryption hash algorithm", \
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_ITER_TIME(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_ITER_TIME, \
|
|
.type = QEMU_OPT_NUMBER, \
|
|
.help = "Time to spend in PBKDF in milliseconds", \
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_STATE(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_STATE, \
|
|
.type = QEMU_OPT_STRING, \
|
|
.help = "Select new state of affected keyslots (active/inactive)",\
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_DETACHED_HEADER(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_DETACHED_HEADER, \
|
|
.type = QEMU_OPT_BOOL, \
|
|
.help = "Create a detached LUKS header", \
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_KEYSLOT(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_KEYSLOT, \
|
|
.type = QEMU_OPT_NUMBER, \
|
|
.help = "Select a single keyslot to modify explicitly",\
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_OLD_SECRET(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_OLD_SECRET, \
|
|
.type = QEMU_OPT_STRING, \
|
|
.help = "Select all keyslots that match this password", \
|
|
}
|
|
|
|
#define BLOCK_CRYPTO_OPT_DEF_LUKS_NEW_SECRET(prefix) \
|
|
{ \
|
|
.name = prefix BLOCK_CRYPTO_OPT_LUKS_NEW_SECRET, \
|
|
.type = QEMU_OPT_STRING, \
|
|
.help = "New secret to set in the matching keyslots. " \
|
|
"Empty string to erase", \
|
|
}
|
|
|
|
QCryptoBlockCreateOptions *
|
|
block_crypto_create_opts_init(QDict *opts, Error **errp);
|
|
|
|
QCryptoBlockAmendOptions *
|
|
block_crypto_amend_opts_init(QDict *opts, Error **errp);
|
|
|
|
QCryptoBlockOpenOptions *
|
|
block_crypto_open_opts_init(QDict *opts, Error **errp);
|
|
|
|
#endif /* BLOCK_CRYPTO_H */
|