Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
09d9896228 | ||
|
|
5a599025ad | ||
|
|
f5c2bcc024 |
@@ -29,7 +29,7 @@ val gitExecutor = objects.newInstance(GitExecutor::class.java)
|
|||||||
|
|
||||||
val gitCommitCount = gitExecutor.execute("git rev-list HEAD --count", rootDir).toInt()
|
val gitCommitCount = gitExecutor.execute("git rev-list HEAD --count", rootDir).toInt()
|
||||||
val gitCommitHash = gitExecutor.execute("git rev-parse --verify --short HEAD", rootDir)
|
val gitCommitHash = gitExecutor.execute("git rev-parse --verify --short HEAD", rootDir)
|
||||||
val verName = "v4.0"
|
val verName = "v4.1"
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "org.matrix.TEESimulator"
|
namespace = "org.matrix.TEESimulator"
|
||||||
|
|||||||
@@ -91,27 +91,33 @@ object AndroidDeviceUtils {
|
|||||||
attestationValueProvider: () -> ByteArray?,
|
attestationValueProvider: () -> ByteArray?,
|
||||||
expectedSize: Int,
|
expectedSize: Int,
|
||||||
): ByteArray {
|
): ByteArray {
|
||||||
// 1. Attempt to get the value from the system property.
|
|
||||||
getProperty(propertyName, expectedSize)?.let {
|
getProperty(propertyName, expectedSize)?.let {
|
||||||
SystemLogger.debug("Using $propertyName from system property: ${it.toHex()}")
|
SystemLogger.debug("Using $propertyName from system property: ${it.toHex()}")
|
||||||
|
persistToFile(propertyName, it)
|
||||||
return it
|
return it
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Fallback to the value from a cached TEE attestation.
|
|
||||||
try {
|
try {
|
||||||
attestationValueProvider()?.let {
|
attestationValueProvider()?.let {
|
||||||
SystemLogger.debug("Using $propertyName from TEE attestation: ${it.toHex()}")
|
SystemLogger.debug("Using $propertyName from TEE attestation: ${it.toHex()}")
|
||||||
setProperty(propertyName, it) // Persist for consistency
|
setProperty(propertyName, it)
|
||||||
|
persistToFile(propertyName, it)
|
||||||
return it
|
return it
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
SystemLogger.error("Failed to get $propertyName from attestation.", e)
|
SystemLogger.error("Failed to get $propertyName from attestation.", e)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. As a final fallback, generate a random value.
|
readFromFile(propertyName, expectedSize)?.let {
|
||||||
|
SystemLogger.debug("Using $propertyName from persistent file: ${it.toHex()}")
|
||||||
|
setProperty(propertyName, it)
|
||||||
|
return it
|
||||||
|
}
|
||||||
|
|
||||||
return generateRandomBytes(expectedSize).also {
|
return generateRandomBytes(expectedSize).also {
|
||||||
SystemLogger.debug("Using randomly generated $propertyName: ${it.toHex()}")
|
SystemLogger.debug("Using randomly generated $propertyName: ${it.toHex()}")
|
||||||
setProperty(propertyName, it)
|
setProperty(propertyName, it)
|
||||||
|
persistToFile(propertyName, it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,10 +164,37 @@ object AndroidDeviceUtils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Generates a cryptographically random byte array of a specified length. */
|
|
||||||
private fun generateRandomBytes(size: Int): ByteArray =
|
private fun generateRandomBytes(size: Int): ByteArray =
|
||||||
ByteArray(size).also { ThreadLocalRandom.current().nextBytes(it) }
|
ByteArray(size).also { ThreadLocalRandom.current().nextBytes(it) }
|
||||||
|
|
||||||
|
private val PERSIST_DIR = File("/data/adb/tricky_store")
|
||||||
|
|
||||||
|
private fun fileForProperty(propertyName: String): File = when (propertyName) {
|
||||||
|
"ro.boot.vbmeta.digest" -> File(PERSIST_DIR, "boot_hash.bin")
|
||||||
|
"ro.boot.vbmeta.public_key_digest" -> File(PERSIST_DIR, "boot_key.bin")
|
||||||
|
else -> File(PERSIST_DIR, "${propertyName.replace('.', '_')}.bin")
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun persistToFile(propertyName: String, bytes: ByteArray) {
|
||||||
|
try {
|
||||||
|
fileForProperty(propertyName).writeBytes(bytes)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
SystemLogger.error("Failed to persist $propertyName to file.", e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun readFromFile(propertyName: String, expectedSize: Int): ByteArray? {
|
||||||
|
return try {
|
||||||
|
val file = fileForProperty(propertyName)
|
||||||
|
if (!file.exists()) return null
|
||||||
|
val bytes = file.readBytes()
|
||||||
|
if (bytes.size == expectedSize) bytes else null
|
||||||
|
} catch (e: Exception) {
|
||||||
|
SystemLogger.error("Failed to read $propertyName from file.", e)
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// --- Patch Level Properties ---
|
// --- Patch Level Properties ---
|
||||||
|
|
||||||
fun getPatchLevel(uid: Int): Int {
|
fun getPatchLevel(uid: Int): Int {
|
||||||
|
|||||||
@@ -1,3 +1,13 @@
|
|||||||
|
## TEESimulator v4.1: Boot Identity Persistence
|
||||||
|
|
||||||
|
Bugfix release. The vbmeta boot key digest was randomizing on every reboot, producing a different RootOfTrust in attestation certificates each boot.
|
||||||
|
|
||||||
|
On devices where the kernel doesn't set `ro.boot.vbmeta.public_key_digest`, the fallback chain hit random generation every boot because `resetprop` overrides for `ro.boot.*` props don't survive reboots. Added file-based persistence (`boot_hash.bin`, `boot_key.bin`) between the TEE cache and random fallback. Once determined, boot identity values persist across reboots.
|
||||||
|
|
||||||
|
Verified on Redmi 14C: second boot reads from persistent file instead of regenerating.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## TEESimulator v4.0: Native Rust Cert Generation
|
## TEESimulator v4.0: Native Rust Cert Generation
|
||||||
|
|
||||||
Major release. Certificate chain generation rebuilt from the ground up in Rust, replacing the BouncyCastle Java path for EC and RSA keys. Hardened against every known detector app.
|
Major release. Certificate chain generation rebuilt from the ground up in Rust, replacing the BouncyCastle Java path for EC and RSA keys. Hardened against every known detector app.
|
||||||
|
|||||||
@@ -9,3 +9,4 @@ done
|
|||||||
|
|
||||||
rm -rf "$CONFIG_DIR/persistent_keys"
|
rm -rf "$CONFIG_DIR/persistent_keys"
|
||||||
rm -f "$CONFIG_DIR/tee_status.txt"
|
rm -f "$CONFIG_DIR/tee_status.txt"
|
||||||
|
rm -f "$CONFIG_DIR/boot_hash.bin" "$CONFIG_DIR/boot_key.bin"
|
||||||
|
|||||||
+3
-3
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"version": "v4.0",
|
"version": "v4.1",
|
||||||
"versionCode": 90,
|
"versionCode": 94,
|
||||||
"zipUrl": "https://github.com/Enginex0/TEESimulator/releases/download/v4.0/TEESimulator-v4.0-Release.zip",
|
"zipUrl": "https://github.com/Enginex0/TEESimulator/releases/download/v4.1/TEESimulator-v4.1-Release.zip",
|
||||||
"changelog": "https://raw.githubusercontent.com/Enginex0/TEESimulator/main/module/changelog.md"
|
"changelog": "https://raw.githubusercontent.com/Enginex0/TEESimulator/main/module/changelog.md"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user