Skip to contentSkip to conversation

fscrypt-crypt-util: fix KDF contexts for SM8650

PATCH In review Eric Biggers 2 participants 3 messages Jan 18, 2025 – Feb 11, 2025 fscrypt: file system level encryption support

lore
Share & tools
lore

Eric Biggers

author maintainer
#0 lore raw

PATCH 1/1 fscrypt-crypt-util: fix KDF contexts for SM8650

From: Eric Biggers <[email protected]>

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.

---
 src/fscrypt-crypt-util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
src/fscrypt-crypt-util.c +2 -2
index 4dde1d4a..f51b3669 100644
@@ -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

Signature · 1 line
2.48.1
author maintainer
#1 lore raw
Quoted 8 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 4 lines
---
 src/fscrypt-crypt-util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Ping. Zorro, could you apply this please? Thanks!

- Eric

Reviewed-by
#2 lore raw
Quoted 9 lines · Eric Biggers
Quoted 8 lines · Eric Biggers

From: Eric Biggers <[email protected]>

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.

Quoted 6 lines
Quoted 4 lines
---
 src/fscrypt-crypt-util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Ping. Zorro, could you apply this please? Thanks!

Sure Eric. I don't have a hardware to give it a test, but other cases which use fscrypt-crypt-util test passed. And I trust you much on this change, so

Quoted 3 lines

- Eric