Skip to content

Commit c10ba0c

Browse files
fix(mobile): build the DPoP curve spec without the API 26 AlgorithmParameters
AlgorithmParameters.getInstance("EC") needs Android 8.0, but the app supports API 24. Take the secp256r1 spec from a generated key instead, and cover the signer's raw r‖s output with a JVM test. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 6955d1a commit c10ba0c

3 files changed

Lines changed: 80 additions & 10 deletions

File tree

‎apps/mobile/modules/t3-native-controls/android/build.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,11 @@ dependencies {
2929
implementation 'androidx.activity:activity:1.8.2'
3030
implementation 'androidx.compose.material3:material3-android:1.5.0-alpha17'
3131
implementation 'androidx.window:window:1.5.1'
32+
testImplementation 'junit:junit:4.13.2'
33+
}
34+
35+
tasks.withType(Test).configureEach {
36+
javaLauncher = javaToolchains.launcherFor {
37+
languageVersion = JavaLanguageVersion.of(21)
38+
}
3239
}

‎apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3DpopKeys.kt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package expo.modules.t3nativecontrols
22

33
import java.math.BigInteger
4-
import java.security.AlgorithmParameters
54
import java.security.KeyFactory
65
import java.security.KeyPairGenerator
76
import java.security.PrivateKey
@@ -20,19 +19,17 @@ internal object T3DpopKeys {
2019
private const val SCALAR_BYTES = 32
2120
private const val CURVE = "secp256r1"
2221
private const val ALGORITHM = "SHA256withECDSA"
23-
private val curve: ECParameterSpec by lazy {
24-
AlgorithmParameters.getInstance("EC").run {
25-
init(ECGenParameterSpec(CURVE))
26-
getParameterSpec(ECParameterSpec::class.java)
27-
}
22+
// AlgorithmParameters("EC") needs API 26; a generated key carries the same spec on any level.
23+
private val curve: ECParameterSpec by lazy { (generateKeyPair().public as ECPublicKey).params }
24+
25+
private fun generateKeyPair() = KeyPairGenerator.getInstance("EC").run {
26+
initialize(ECGenParameterSpec(CURVE))
27+
generateKeyPair()
2828
}
2929

3030
/** The private scalar followed by the public point. */
3131
fun generate(): ByteArray {
32-
val pair = KeyPairGenerator.getInstance("EC").run {
33-
initialize(ECGenParameterSpec(CURVE))
34-
generateKeyPair()
35-
}
32+
val pair = generateKeyPair()
3633
val point = (pair.public as ECPublicKey).w
3734
return scalar((pair.private as ECPrivateKey).s) +
3835
byteArrayOf(UNCOMPRESSED) +
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
package expo.modules.t3nativecontrols
2+
3+
import java.math.BigInteger
4+
import java.security.KeyFactory
5+
import java.security.Signature
6+
import java.security.spec.ECGenParameterSpec
7+
import java.security.spec.ECParameterSpec
8+
import java.security.spec.ECPoint
9+
import java.security.spec.ECPublicKeySpec
10+
import java.security.AlgorithmParameters
11+
import org.junit.Assert.assertArrayEquals
12+
import org.junit.Assert.assertEquals
13+
import org.junit.Assert.assertFalse
14+
import org.junit.Assert.assertTrue
15+
import org.junit.Test
16+
17+
class T3DpopKeysTest {
18+
@Test
19+
fun signsRawSignaturesThatVerifyAgainstTheGeneratedPublicKey() {
20+
val key = T3DpopKeys.generate()
21+
val privateKey = key.copyOfRange(0, 32)
22+
val publicKey = key.copyOfRange(32, 97)
23+
assertTrue(T3DpopKeys.matches(privateKey, publicKey))
24+
assertFalse(T3DpopKeys.matches(T3DpopKeys.generate().copyOfRange(0, 32), publicKey))
25+
26+
val input = "header.payload".toByteArray()
27+
repeat(32) {
28+
val raw = T3DpopKeys.sign(privateKey, input)
29+
assertEquals(64, raw.size)
30+
val verifier = Signature.getInstance("SHA256withECDSA").apply {
31+
initVerify(jcaPublicKey(publicKey))
32+
update(input)
33+
}
34+
assertTrue(verifier.verify(der(raw)))
35+
}
36+
}
37+
38+
@Test
39+
fun convertsShortAndSignPaddedDerIntegersToFixedWidth() {
40+
// r has a 0x00 sign byte (33 bytes); s is a single byte.
41+
val r = byteArrayOf(0) + ByteArray(32) { 0x80.toByte() }
42+
val der = byteArrayOf(0x30, (2 + r.size + 3).toByte(), 0x02, r.size.toByte()) + r +
43+
byteArrayOf(0x02, 0x01, 0x05)
44+
val expected = ByteArray(32) { 0x80.toByte() } + ByteArray(31) + byteArrayOf(5)
45+
assertArrayEquals(expected, T3DpopKeys.rawSignature(der))
46+
}
47+
48+
private fun jcaPublicKey(bytes: ByteArray) = KeyFactory.getInstance("EC").generatePublic(
49+
ECPublicKeySpec(
50+
ECPoint(BigInteger(1, bytes.copyOfRange(1, 33)), BigInteger(1, bytes.copyOfRange(33, 65))),
51+
AlgorithmParameters.getInstance("EC").run {
52+
init(ECGenParameterSpec("secp256r1"))
53+
getParameterSpec(ECParameterSpec::class.java)
54+
},
55+
),
56+
)
57+
58+
private fun der(raw: ByteArray): ByteArray {
59+
fun integer(bytes: ByteArray): ByteArray {
60+
val value = BigInteger(1, bytes).toByteArray()
61+
return byteArrayOf(0x02, value.size.toByte()) + value
62+
}
63+
val body = integer(raw.copyOfRange(0, 32)) + integer(raw.copyOfRange(32, 64))
64+
return byteArrayOf(0x30, body.size.toByte()) + body
65+
}
66+
}

0 commit comments

Comments
 (0)