From: Eric Biggers Date: Sat, 18 Jan 2025 07:23:36 +0000 (-0800) Subject: fscrypt-crypt-util: fix KDF contexts for SM8650 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a18fe0c141b0bddfe2da40cb4faf7ceebe6b9224;p=users%2Fhch%2Fxfstests-dev.git fscrypt-crypt-util: fix KDF contexts for SM8650 Update the KDF contexts to match those actually used on SM8650. This turns out to be needed for the hardware-wrapped key tests generic/368 and generic/369 to pass on the SM8650 HDK (now that I have one to actually test it). Apparently the contexts changed between the prototype version I tested a couple years ago and the final version. Signed-off-by: Eric Biggers Reviewed-by: Zorro Lang Signed-off-by: Zorro Lang --- diff --git a/src/fscrypt-crypt-util.c b/src/fscrypt-crypt-util.c index 4dde1d4ac..f51b36692 100644 --- a/src/fscrypt-crypt-util.c +++ b/src/fscrypt-crypt-util.c @@ -2280,7 +2280,7 @@ static void derive_inline_encryption_key(const u8 *master_key, u8 inlinecrypt_key[INLINECRYPT_KEY_SIZE]) { static const u8 ctx[36] = - "inline encryption key\0\0\0\0\0\0\x03\x43\0\x82\x50\0\0\0\0"; + "inline encryption key\0\0\0\0\0\0\x02\x43\0\x82\x50\0\0\0\0"; hw_kdf(master_key, master_key_size, ctx, sizeof(ctx), inlinecrypt_key, INLINECRYPT_KEY_SIZE); @@ -2290,7 +2290,7 @@ static void derive_sw_secret(const u8 *master_key, size_t master_key_size, u8 sw_secret[SW_SECRET_SIZE]) { static const u8 ctx[28] = - "raw secret\0\0\0\0\0\0\0\0\0\x03\x17\0\x80\x50\0\0\0\0"; + "raw secret\0\0\0\0\0\0\0\0\0\x02\x17\0\x80\x50\0\0\0\0"; hw_kdf(master_key, master_key_size, ctx, sizeof(ctx), sw_secret, SW_SECRET_SIZE);