From: Eric Biggers <ebiggers@xxxxxxxxxx>
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 <ebiggers@xxxxxxxxxx>
---
src/fscrypt-crypt-util.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/fscrypt-crypt-util.c b/src/fscrypt-crypt-util.c
index 4dde1d4a..f51b3669 100644
--- a/src/fscrypt-crypt-util.c
+++ b/src/fscrypt-crypt-util.c
@@ -2278,21 +2278,21 @@ static void hw_kdf(const u8 *master_key, size_t master_key_size,
static void derive_inline_encryption_key(const u8 *master_key,
size_t master_key_size,
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);
}
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);
}
base-commit: dec8cfb46ba0f19d29d13412841f68ebf119a452
--
2.48.1
|