mkfs.ubifs: More fscryptctl compatibility

fscryptctl reads up to FS_MAX_KEY_SIZE bytes from the source key
to compute the descriptor.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

diff --git a/ubifs-utils/mkfs.ubifs/fscrypt.c b/ubifs-utils/mkfs.ubifs/fscrypt.c
index 29dad1b039e7ab08b4d79baae8890b6dd034f8b6..3d4bff6180504182f883743249be73b388dfa37f 100644 (file)
--- a/ubifs-utils/mkfs.ubifs/fscrypt.c
+++ b/ubifs-utils/mkfs.ubifs/fscrypt.c
@@ -202,7 +202,7 @@ static int load_master_key(const char *key_file, struct cipher *fsc)
                return -1;
        }
 
-       keysize = read(kf, fscrypt_masterkey, fsc->key_length);
+       keysize = read(kf, fscrypt_masterkey, FS_MAX_KEY_SIZE);
        if (keysize < 0) {
                sys_errmsg("read '%s'", key_file);
                goto fail;