diff options
author | Richard Weinberger <richard@nod.at> | 2018-10-18 16:37:12 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2018-11-01 12:42:01 +0100 |
commit | 9c8caf5aca7527235afcbbb813e9bf490a239dee (patch) | |
tree | c5dbafb842920201295ae9572084f66467799d33 /ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | |
parent | 922a6e998538a1ea57682d0d3373cb4d19e9dc02 (diff) |
mkfs.ubifs: Compute encryption key descriptor automatically
...if none is given. To be compatible with fscryptctl.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'ubifs-utils/mkfs.ubifs/mkfs.ubifs.c')
-rw-r--r-- | ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c index 9bd15a2..f8d8e52 100644 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c @@ -752,8 +752,6 @@ static int get_options(int argc, char**argv) if (key_file || key_desc) { if (!key_file) return err_msg("no key file specified"); - if (!key_desc) - return err_msg("no key descriptor specified"); c->double_hash = 1; c->encrypted = 1; |