kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zkey: Add open and format options to the cryptsetup command

Browse Source 
For LUKS2 volumes the cryptsetup command currently generates
'cryptsetup luksFormat' commands, but for plain mode volumes it
generates 'cryptsetup plainOpen' commands.

With the --open option it can now also generate 'cryptsetup luksOpen'
commands for opening LUKS2 volumes. With the --format option you can
limit the generated commands to only generate 'cryptsetup luksFormat'
commands for LUKS2 volumes, and skip plain mode volumes.
The default behavior (i.e. if none of the two options specified),
remains the same as before.

Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Ingo Franzki
2019-03-14 16:36:35 +01:00
committed by Jan Höppner
parent 3ed8ab4e2a
commit 11bfa1d3c8
4 changed files with 133 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zkey/zkey.c
+37 -1
View File
@@ -77,6 +77,8 @@ static struct zkey_globals {
long long keyfile_size;
long long tries;
bool force;
bool open;
bool format;
void *lib_csulcca;
t_CSNBKTC dll_CSNBKTC;
int pkey_fd;
@@ -111,6 +113,8 @@ static struct zkey_globals {
#define OPT_CRYPTSETUP_KEYFILE_OFFSET 257
#define OPT_CRYPTSETUP_KEYFILE_SIZE 258
#define OPT_CRYPTSETUP_TRIES 259
#define OPT_CRYPTSETUP_OPEN 260
#define OPT_CRYPTSETUP_FORMAT 261
/*
* Configuration of command line options
@@ -691,6 +695,23 @@ static struct util_opt opt_vec[] = {
"command(s)",
.command = COMMAND_CRYPTSETUP,
},
#ifdef HAVE_LUKS2_SUPPORT
{
.option = {"open", 0, NULL, OPT_CRYPTSETUP_OPEN},
.desc = "Generates luksOpen or plainOpen commands. For the "
"plain volume type, this is the default",
.command = COMMAND_CRYPTSETUP,
.flags = UTIL_OPT_FLAG_NOSHORT,
},
{
.option = {"format", 0, NULL, OPT_CRYPTSETUP_FORMAT},
.desc = "Generates luksFormat commands. For the LUKS2 volume "
"type, this is the default. If specified for the "
"plain volume type, then no command is generated",
.command = COMMAND_CRYPTSETUP,
.flags = UTIL_OPT_FLAG_NOSHORT,
},
#endif
/***********************************************************/
{
.flags = UTIL_OPT_FLAG_SECTION,
@@ -1490,9 +1511,16 @@ static int command_cryptsetup(void)
{
int rc;
if (g.open && g.format) {
warnx("Either '--open' or '--format' can be specified, but "
"not both");
util_prg_print_parse_error();
return EXIT_FAILURE;
}
rc = keystore_cryptsetup(g.keystore, g.volumes, g.run, g.volume_type,
g.keyfile, g.keyfile_offset, g.keyfile_size,
g.tries, g.batch_mode);
g.tries, g.batch_mode, g.open, g.format);
return rc != 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
@@ -1728,6 +1756,14 @@ int main(int argc, char *argv[])
case 'q':
g.batch_mode = 1;
break;
#ifdef HAVE_LUKS2_SUPPORT
case OPT_CRYPTSETUP_OPEN:
g.open = 1;
break;
case OPT_CRYPTSETUP_FORMAT:
g.format = 1;
break;
#endif
case 'h':
print_help(command);
return EXIT_SUCCESS;