jzy/TEESimulator-RS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(config): restore AUTO mode resolution for bare target entries

Browse Source 
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.
This commit is contained in:
Enginex0
2026-03-31 18:53:18 +01:00
parent 54c12a9fd5
commit 1b7800345d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/matrix/TEESimulator/config/ConfigurationManager.kt
+3 -2
View File
@@ -7,6 +7,7 @@ import android.os.IBinder
import android.os.ServiceManager import android.os.ServiceManager
import java.io.File import java.io.File
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import org.matrix.TEESimulator.attestation.DeviceAttestationService
import org.matrix.TEESimulator.logging.SystemLogger import org.matrix.TEESimulator.logging.SystemLogger
import org.matrix.TEESimulator.pki.KeyBoxManager import org.matrix.TEESimulator.pki.KeyBoxManager
@@ -102,7 +103,7 @@ object ConfigurationManager {
when (packageModes[pkg]) { when (packageModes[pkg]) {
Mode.GENERATE -> return Mode.GENERATE Mode.GENERATE -> return Mode.GENERATE
Mode.PATCH -> return Mode.PATCH Mode.PATCH -> return Mode.PATCH
Mode.AUTO -> return Mode.AUTO Mode.AUTO -> return if (DeviceAttestationService.isTeeFunctional) Mode.PATCH else Mode.GENERATE
null -> continue null -> continue
} }
} }
@@ -165,7 +166,7 @@ object ConfigurationManager {
newKeyboxes[pkg] = currentKeybox newKeyboxes[pkg] = currentKeybox
} }
else -> { else -> {
newModes[trimmedLine] = Mode.GENERATE newModes[trimmedLine] = Mode.AUTO
newKeyboxes[trimmedLine] = currentKeybox newKeyboxes[trimmedLine] = currentKeybox
} }
} }