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@gmail.com>
This commit is contained in:
Dakkshesh
2025-08-13 12:26:25 +05:30
parent 10c1a41981
commit 6517fd2569
@@ -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<ASN1Encodable>(