From e7f446432b92b293e758099842843cfb1f18fa97 Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Tue, 21 Jan 2020 14:42:04 +0100 Subject: [PATCH] zkey: Fix display of clear key size for XTS keys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 298fab68fee8 ("zkey: Preparations for introducing a new key type") Signed-off-by: Ingo Franzki Signed-off-by: Jan Höppner --- zkey/pkey.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zkey/pkey.c b/zkey/pkey.c index 462f9fee..640ff866 100644 --- a/zkey/pkey.c +++ b/zkey/pkey.c @@ -1591,8 +1591,8 @@ int get_key_bit_size(const u8 *key, size_t key_size, size_t *bitsize) if (is_cca_aes_data_key(key, key_size)) { *bitsize = datakey->bitsize; if (key_size == 2 * AESDATA_KEY_SIZE) { - datakey = (struct aesdatakeytoken *)key + - AESDATA_KEY_SIZE; + datakey = (struct aesdatakeytoken *)(key + + AESDATA_KEY_SIZE); *bitsize += datakey->bitsize; } } else if (is_cca_aes_cipher_key(key, key_size)) { @@ -1601,8 +1601,8 @@ int get_key_bit_size(const u8 *key, size_t key_size, size_t *bitsize) else *bitsize = 0; /* Unknown */ if (key_size > cipherkey->length) { - cipherkey = (struct aescipherkeytoken *)key + - cipherkey->length; + cipherkey = (struct aescipherkeytoken *)(key + + cipherkey->length); if (cipherkey->pfv == 0x00) /* V0 payload */ *bitsize += cipherkey->pl - 384; }