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

fix(keystore): resolve grant-domain attest key

Browse Source
This commit is contained in:
Enginex0
2026-07-11 16:39:05 +01:00
parent d2cb950cb6
commit c9918952f4
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/matrix/TEESimulator/interception/keystore/shim/KeyMintSecurityLevelInterceptor.kt
+10 -1
View File
@@ -892,7 +892,16 @@ class KeyMintSecurityLevelInterceptor(
// signed by the attest key the caller chains to via getCertChain, never silently re-rooted // signed by the attest key the caller chains to via getCertChain, never silently re-rooted
// under the keybox (which double-roots the assembled chain and fails verification). // under the keybox (which double-roots the assembled chain and fails verification).
val attestKeyAlias: String? = val attestKeyAlias: String? =
attestationKey?.let { it.alias ?: findGeneratedAliasByKeyId(callingUid, it.nspace) } attestationKey?.let {
if (it.domain == Domain.GRANT)
resolveGrant(it.nspace, callingUid)?.ownerKeyId?.alias
else it.alias ?: findGeneratedAliasByKeyId(callingUid, it.nspace)
}
if (attestationKey != null && attestationKey.domain == Domain.GRANT) {
SystemLogger.uidLog(callingUid, txId, "attest-grant") {
"grantId=${attestationKey.nspace} → signer=$attestKeyAlias"
}
}
if (attestationKey != null && attestKeyAlias == null) { if (attestationKey != null && attestKeyAlias == null) {
throw android.os.ServiceSpecificException( throw android.os.ServiceSpecificException(
KEYMINT_INVALID_ARGUMENT, KEYMINT_INVALID_ARGUMENT,