Skip to content

Add support to pass in hardcoded root/key. #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support to pass in hardcoded root/key. #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/kotlin/testing/KeyAttestationCertFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder
import org.bouncycastle.operator.ContentSigner
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder

internal class KeyAttestationCertFactory(val fakeCalendar: FakeCalendar = FakeCalendar.DEFAULT) {
internal class KeyAttestationCertFactory(
val fakeCalendar: FakeCalendar = FakeCalendar.DEFAULT,
val hardodedRootKey: KeyPair? = null,
val hardcodedRoot: X509Certificate? = null,
) {
private val ecKeyPairGenerator =
KeyPairGenerator.getInstance("EC").apply {
initialize(ECGenParameterSpec("secp256r1"), FakeSecureRandom())
Expand All @@ -60,13 +64,13 @@ internal class KeyAttestationCertFactory(val fakeCalendar: FakeCalendar = FakeCa

internal fun generateRsaKeyPair() = rsaKeyPairGenerator.generateKeyPair()

val rootKey = ecKeyPairGenerator.generateKeyPair()
val rootKey = hardodedRootKey ?: ecKeyPairGenerator.generateKeyPair()
val intermediateKey = ecKeyPairGenerator.generateKeyPair()
val rkpKey = ecKeyPairGenerator.generateKeyPair()
val attestationKey = ecKeyPairGenerator.generateKeyPair()
val leafKey: KeyPair = ecKeyPairGenerator.generateKeyPair()

val root: X509Certificate = generateRootCertificate()
val root: X509Certificate = hardcodedRoot ?: generateRootCertificate()
val factoryIntermediate = generateIntermediateCertificate()
val remoteIntermediate = generateIntermediateCertificate(subject = REMOTE_INTERMEDIATE_SUBJECT)
val rkpIntermediate =
Expand Down
12 changes: 10 additions & 2 deletions src/main/kotlin/testing/KeyAttestationCertPathFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,24 @@ import com.android.keyattestation.verifier.KeyDescription
import com.android.keyattestation.verifier.SecurityLevel
import com.android.keyattestation.verifier.provider.KeyAttestationCertPath
import java.math.BigInteger
import java.security.KeyPair
import java.security.PublicKey
import java.security.cert.X509Certificate

/**
* Factory for creating valid [KeyAttestationCertPath] chains for testing.
*
* @param fakeCalendar the fake calendar for the certificate chains validity period.
*/
class KeyAttestationCertPathFactory(val fakeCalendar: FakeCalendar = FakeCalendar()) {
class KeyAttestationCertPathFactory
@JvmOverloads
constructor(
val fakeCalendar: FakeCalendar = FakeCalendar(),
val hardcodedRootKey: KeyPair? = null,
val hardcodedRoot: X509Certificate? = null,
) {
private val certFactory: KeyAttestationCertFactory =
KeyAttestationCertFactory(fakeCalendar = fakeCalendar)
KeyAttestationCertFactory(fakeCalendar, hardcodedRootKey, hardcodedRoot)

/* The root certificate of all generated certificate chains. */
val root = certFactory.root
Expand Down
Loading