Skip to content

Commit 94d85f9

Browse files
committed
imgtool: Fix x25519 TLV HMAC tag
HMAC-SHA512 has been incorrectly fed only 32 bytes of password. Signed-off-by: Dominik Ermel <[email protected]>
1 parent 32db788 commit 94d85f9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/imgtool/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ def ecies_hkdf(self, enckey, plainkey, hmac_sha_alg):
445445
newpk = X25519PrivateKey.generate()
446446
shared = newpk.exchange(enckey._get_public())
447447
derived_key = HKDF(
448-
algorithm=hmac_sha_alg, length=48, salt=None,
448+
algorithm=hmac_sha_alg, length=16 + hmac_sha_alg.digest_size, salt=None,
449449
info=b'MCUBoot_ECIES_v1', backend=default_backend()).derive(shared)
450450
encryptor = Cipher(algorithms.AES(derived_key[:16]),
451451
modes.CTR(bytes([0] * 16)),

0 commit comments

Comments
 (0)