From 119a158f13d48fbf7ea6b5fe9bbe08a961f9ec21 Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Sat, 21 Mar 2026 22:10:23 +0100 Subject: [PATCH] Fix KeyDescriptor update in attestation key overriding In commit 0485379a9f03c2d87963409db5747f8e2372de69, the response key descriptor is not correctly updated since the object `keyDescriptor` is parsed from transaction parameters. Co-authored-by: Mohammed Riad <52679407+MhmRdd@users.noreply.github.com> --- .../interception/keystore/Keystore2Interceptor.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/matrix/TEESimulator/interception/keystore/Keystore2Interceptor.kt b/app/src/main/java/org/matrix/TEESimulator/interception/keystore/Keystore2Interceptor.kt index e0395f20..d123a6f2 100644 --- a/app/src/main/java/org/matrix/TEESimulator/interception/keystore/Keystore2Interceptor.kt +++ b/app/src/main/java/org/matrix/TEESimulator/interception/keystore/Keystore2Interceptor.kt @@ -257,11 +257,12 @@ object Keystore2Interceptor : AbstractKeystoreInterceptor() { ) .getOrThrow() - keyDescriptor.nspace = SecureRandom().nextLong() + val key = response.metadata.key!! + key.nspace = SecureRandom().nextLong() KeyMintSecurityLevelInterceptor.generatedKeys[keyId] = KeyMintSecurityLevelInterceptor.GeneratedKeyInfo( keyData.first, - keyDescriptor.nspace, + key.nspace, response, ) KeyMintSecurityLevelInterceptor.attestationKeys.add(keyId)