From 189d8c872bb1ac5a0280fbf232493ad4e15b09f9 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Thu, 18 Oct 2018 16:37:17 +0200 Subject: mkfs.ubifs: Print key descriptor only when generated Signed-off-by: Richard Weinberger Signed-off-by: David Oberhollenzer --- ubifs-utils/mkfs.ubifs/fscrypt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 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 3d4bff6..6d2b650 100644 --- a/ubifs-utils/mkfs.ubifs/fscrypt.c +++ b/ubifs-utils/mkfs.ubifs/fscrypt.c @@ -65,13 +65,13 @@ void free_fscrypt_context(struct fscrypt_context *fctx) free(fctx); } -void print_fscrypt_master_key_descriptor(struct fscrypt_context *fctx) +static void print_fscrypt_master_key_descriptor(__u8 *master_key_descriptor) { int i; normsg_cont("fscrypt master key descriptor: 0x"); for (i = 0; i < FS_KEY_DESCRIPTOR_SIZE; i++) { - printf("%02x", fctx->master_key_descriptor[i]); + printf("%02x", master_key_descriptor[i]); } printf("\n"); } @@ -248,6 +248,7 @@ struct fscrypt_context *init_fscrypt_context(const char *cipher_name, if (!key_descriptor) { if (derive_key_descriptor(fscrypt_masterkey, master_key_descriptor)) return NULL; + print_fscrypt_master_key_descriptor(master_key_descriptor); } else { if (parse_key_descriptor(key_descriptor, master_key_descriptor)) return NULL; -- cgit v1.2.3