From 1b7800345d2162e7b9bc2f591eda89b9bcc1c26f Mon Sep 17 00:00:00 2001 From: Enginex0 Date: Tue, 31 Mar 2026 18:53:18 +0100 Subject: [PATCH] fix(config): restore AUTO mode resolution for bare target entries v6.0 changed bare target.txt entries from AUTO to GENERATE, breaking apps like BHIM that need TEE-backed attestation keys. Restore AUTO as default and resolve it at config level (PATCH if TEE works, GENERATE if not) to bypass the non-deterministic raceTeePatch path. --- .../org/matrix/TEESimulator/config/ConfigurationManager.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/matrix/TEESimulator/config/ConfigurationManager.kt b/app/src/main/java/org/matrix/TEESimulator/config/ConfigurationManager.kt index 44234ee..f5f6c4a 100644 --- a/app/src/main/java/org/matrix/TEESimulator/config/ConfigurationManager.kt +++ b/app/src/main/java/org/matrix/TEESimulator/config/ConfigurationManager.kt @@ -7,6 +7,7 @@ import android.os.IBinder import android.os.ServiceManager import java.io.File import java.util.concurrent.ConcurrentHashMap +import org.matrix.TEESimulator.attestation.DeviceAttestationService import org.matrix.TEESimulator.logging.SystemLogger import org.matrix.TEESimulator.pki.KeyBoxManager @@ -102,7 +103,7 @@ object ConfigurationManager { when (packageModes[pkg]) { Mode.GENERATE -> return Mode.GENERATE Mode.PATCH -> return Mode.PATCH - Mode.AUTO -> return Mode.AUTO + Mode.AUTO -> return if (DeviceAttestationService.isTeeFunctional) Mode.PATCH else Mode.GENERATE null -> continue } } @@ -165,7 +166,7 @@ object ConfigurationManager { newKeyboxes[pkg] = currentKeybox } else -> { - newModes[trimmedLine] = Mode.GENERATE + newModes[trimmedLine] = Mode.AUTO newKeyboxes[trimmedLine] = currentKeybox } }