From 5f72acb1e71748b2f489e620f8ce0bd82bb9a8b0 Mon Sep 17 00:00:00 2001 From: Enginex0 Date: Tue, 19 May 2026 14:29:29 +0100 Subject: [PATCH] fix(shim): revert nspace attestation key lookup Reverts d7dc5e0. The KEY_ID-domain alias-null branch targeted duck-detector's timing-side-channel WARN, but the WARN persisted in subsequent testing and the combined fix attempts pushed the Tamper score from 4 to 14 with a new key-tamper detection on a second detector. Roll back to the a7e7e45 baseline to investigate from a clean state. --- .../keystore/shim/KeyMintSecurityLevelInterceptor.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/org/matrix/TEESimulator/interception/keystore/shim/KeyMintSecurityLevelInterceptor.kt b/app/src/main/java/org/matrix/TEESimulator/interception/keystore/shim/KeyMintSecurityLevelInterceptor.kt index ee3f06e..6a9ea1c 100644 --- a/app/src/main/java/org/matrix/TEESimulator/interception/keystore/shim/KeyMintSecurityLevelInterceptor.kt +++ b/app/src/main/java/org/matrix/TEESimulator/interception/keystore/shim/KeyMintSecurityLevelInterceptor.kt @@ -495,8 +495,7 @@ class KeyMintSecurityLevelInterceptor( ConfigurationManager.shouldGenerate(callingUid) || (ConfigurationManager.shouldPatch(callingUid) && isAttestKeyRequest) || (attestationKey != null && - (attestationKey.alias?.let { isAttestationKey(KeyIdentifier(callingUid, it)) } - ?: attestationKeys.any { kid -> kid.uid == callingUid && generatedKeys[kid]?.nspace == attestationKey.nspace })) + isAttestationKey(KeyIdentifier(callingUid, attestationKey.alias))) val isAuto = ConfigurationManager.isAutoMode(callingUid)