From 9ddc6f08c9ecd0a6328ffbef3c444e0a00b2768a Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Wed, 7 Nov 2018 21:21:07 +0100 Subject: mkfs.ubifs: Fix IV selection We need to check for AES being in 128-cbc mode and not 256-cbc. fscrypt supports only 128-cbc and 256-xts so far. Signed-off-by: Richard Weinberger Tested-by: Heiko Schocher Signed-off-by: David Oberhollenzer --- ubifs-utils/mkfs.ubifs/crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubifs-utils/mkfs.ubifs/crypto.c b/ubifs-utils/mkfs.ubifs/crypto.c index 9c6073e..cd68e37 100644 --- a/ubifs-utils/mkfs.ubifs/crypto.c +++ b/ubifs-utils/mkfs.ubifs/crypto.c @@ -152,7 +152,7 @@ static ssize_t encrypt_block(const void *plaintext, size_t size, iv.index = cpu_to_le64(block_index); memset(iv.padding, 0, sizeof(iv.padding)); - if (cipher == EVP_aes_256_cbc()) { + if (cipher == EVP_aes_128_cbc()) { tweak = alloca(ivsize); gen_essiv_salt(&iv, FS_IV_SIZE, key, key_len, tweak); } else { -- cgit v1.2.3