Fix silent error paths, challenge error code, and null handling

(cherry picked from commit d839b69)

Author: MhmRdd

app/src/main/java/org/matrix/TEESimulator/attestation/AttestationBuilder.kt

@@ -418,10 +418,11 @@ object AttestationBuilder {
                 )
             )
 
-            // Collect unique signature digests from the signing history.
-            packageInfo.signingInfo?.signingCertificateHistory?.forEach { signature ->
-                val digest = sha256.digest(signature.toByteArray())
-                signatureDigests.add(Digest(digest))
+            val certs =
+                packageInfo.signingInfo?.signingCertificateHistory
+                    ?: packageInfo.signingInfo?.apkContentsSigners
+            certs?.forEach { signature ->
+                signatureDigests.add(Digest(sha256.digest(signature.toByteArray())))
             }
         }
 

app/src/main/java/org/matrix/TEESimulator/interception/keystore/InterceptorUtils.kt

@@ -168,8 +168,13 @@ object InterceptorUtils {
 
     /** Checks if a reply parcel contains an exception without consuming it. */
     fun hasException(reply: Parcel): Boolean {
-        val exception = runCatching { reply.readException() }.exceptionOrNull()
-        if (exception != null) reply.setDataPosition(0)
-        return exception != null
+        val pos = reply.dataPosition()
+        return try {
+            reply.readException()
+            false
+        } catch (_: Exception) {
+            reply.setDataPosition(pos)
+            true
+        }
     }
 }

app/src/main/java/org/matrix/TEESimulator/interception/keystore/ListEntriesHandler.kt

@@ -81,7 +81,7 @@ object ListEntriesHandler {
         // See AOSP function `get_key_descriptor_for_lookup` in service.rs.
         val keysToInject =
             extractGeneratedKeyDescriptors(callingUid, callingUid.toLong(), params.startPastAlias)
-        val originalList = reply.createTypedArray(KeyDescriptor.CREATOR)!!
+        val originalList = reply.createTypedArray(KeyDescriptor.CREATOR) ?: emptyArray()
         val mergedArray = mergeKeyDescriptors(originalList, keysToInject)
 
         // Limit response size to avoid binder buffer overflow.

app/src/main/java/org/matrix/TEESimulator/interception/keystore/shim/OperationInterceptor.kt

@@ -5,6 +5,7 @@ import android.os.Parcel
 import android.system.keystore2.IKeystoreOperation
 import org.matrix.TEESimulator.interception.core.BinderInterceptor
 import org.matrix.TEESimulator.interception.keystore.InterceptorUtils
+import org.matrix.TEESimulator.logging.SystemLogger
 
 /**
  * Intercepts calls to an `IKeystoreOperation` service. This is used to log the data manipulation
@@ -28,7 +29,11 @@ class OperationInterceptor(
         logTransaction(txId, methodName, callingUid, callingPid, true)
 
         if (code == FINISH_TRANSACTION || code == ABORT_TRANSACTION) {
-            KeyMintSecurityLevelInterceptor.removeOperationInterceptor(target, backdoor)
+            try {
+                KeyMintSecurityLevelInterceptor.removeOperationInterceptor(target, backdoor)
+            } catch (e: Exception) {
+                SystemLogger.error("[TX_ID: $txId] Failed to unregister operation interceptor.", e)
+            }
         }
 
         return TransactionResult.ContinueAndSkipPost

app/src/main/java/org/matrix/TEESimulator/pki/CertificateGenerator.kt

@@ -92,8 +92,8 @@ object CertificateGenerator {
     ): List<Certificate>? {
         val challenge = params.attestationChallenge
         if (challenge != null && challenge.size > AttestationConstants.CHALLENGE_LENGTH_LIMIT)
-            throw IllegalArgumentException(
-                "Attestation challenge exceeds length limit (${challenge.size} > ${AttestationConstants.CHALLENGE_LENGTH_LIMIT})"
+            throw android.os.ServiceSpecificException(
+                -21 // INVALID_INPUT_LENGTH (KM_ERROR_INVALID_INPUT_LENGTH)
             )
 
         return runCatching {