From 9c8caf5aca7527235afcbbb813e9bf490a239dee Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 18 Oct 2018 16:37:12 +0200 Subject: mkfs.ubifs: Compute encryption key descriptor automatically ...if none is given. To be compatible with fscryptctl. Signed-off-by: Richard Weinberger Signed-off-by: David Oberhollenzer --- ubifs-utils/mkfs.ubifs/fscrypt.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'ubifs-utils/mkfs.ubifs/fscrypt.c') diff --git a/ubifs-utils/mkfs.ubifs/fscrypt.c b/ubifs-utils/mkfs.ubifs/fscrypt.c index b9f9acc..ce6e2fc 100644 --- a/ubifs-utils/mkfs.ubifs/fscrypt.c +++ b/ubifs-utils/mkfs.ubifs/fscrypt.c @@ -242,12 +242,17 @@ struct fscrypt_context *init_fscrypt_context(const char *cipher_name, return NULL; } - if (parse_key_descriptor(key_descriptor, master_key_descriptor)) - return NULL; - if (load_master_key(key_file, fscrypt_cipher)) return NULL; + if (!key_descriptor) { + if (derive_key_descriptor(fscrypt_masterkey, master_key_descriptor)) + return NULL; + } else { + if (parse_key_descriptor(key_descriptor, master_key_descriptor)) + return NULL; + } + RAND_bytes((void *)nonce, FS_KEY_DERIVATION_NONCE_SIZE); new_fctx = xmalloc(sizeof(*new_fctx)); -- cgit v1.2.3