From 6517fd2569a8fe71d1e8c143e531fe3140e1f717 Mon Sep 17 00:00:00 2001 From: Dakkshesh Date: Wed, 13 Aug 2025 12:26:25 +0530 Subject: [PATCH] java: CertHacker: Pass imei2 field correctly - It was being passed with the wrong tag ID - Only pass it if attestVersion is >= 300 ref: https://source.android.com/docs/security/features/keystore/attestation#authorizationlist-fields Signed-off-by: Dakkshesh --- .../beakthoven/TrickyStoreOSS/CertificateHacker.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/CertificateHacker.kt b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/CertificateHacker.kt index 741a569..62f434c 100644 --- a/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/CertificateHacker.kt +++ b/app/src/main/java/io/github/beakthoven/TrickyStoreOSS/CertificateHacker.kt @@ -735,9 +735,12 @@ object CertificateHacker { params.serialno?.let { teeEnforcedObjects.add(DERTaggedObject(true, 713, DEROctetString(it))) } params.imei1?.let { teeEnforcedObjects.add(DERTaggedObject(true, 714, DEROctetString(it))) } - params.imei2?.let { teeEnforcedObjects.add(DERTaggedObject(true, 715, DEROctetString(it))) } - params.meid?.let { teeEnforcedObjects.add(DERTaggedObject(true, 723, DEROctetString(it))) } - + params.meid?.let { teeEnforcedObjects.add(DERTaggedObject(true, 715, DEROctetString(it))) } + + if (io.github.beakthoven.TrickyStoreOSS.attestVersion >= 300) { + params.imei2?.let { teeEnforcedObjects.add(DERTaggedObject(true, 723, DEROctetString(it))) } + } + teeEnforcedObjects.sortBy { it.tagNo } val softwareEnforcedObjects = arrayOf(