Migrate off keystore
Implement our own keypair generation and signing (using BoringSSL) and
our own private key blob protection (using Ring). This includes
replacing the old compos_key_service with the new signing_key.
Use DICE as the source of the VM secret used to protect the private
key instead of assuming keystore has one.
Changed compsvc to return the RSAPublicKey directly. Previously we
returned the self-signed cert from Keystore, and composd then
extracted the public key. As a result composd no longer needs any
native helper code to call BoringSSL; however now compsvc does.
Removed similarly redundant key-extraction code from compos_key_cmd.
Create SystemRandom when we need it rather than having it as a field;
it's stateless anyway.
Bug: 214233409
Test: atest ComposKeyTestCase compsvc_device_tests
Change-Id: I8b14fe2acdf43f49d45e2d32d4b6f482bd420eee
diff --git a/compos/composd/src/instance_starter.rs b/compos/composd/src/instance_starter.rs
index 4fed98a..a886584 100644
--- a/compos/composd/src/instance_starter.rs
+++ b/compos/composd/src/instance_starter.rs
@@ -138,13 +138,7 @@
let key_data = service.generateSigningKey().context("Generating signing key")?;
fs::write(&self.key_blob, &key_data.keyBlob).context("Writing key blob")?;
-
- let key_result = composd_native::extract_rsa_public_key(&key_data.certificate);
- let rsa_public_key = key_result.key;
- if rsa_public_key.is_empty() {
- bail!("Failed to extract public key from certificate: {}", key_result.error);
- }
- fs::write(&self.public_key, &rsa_public_key).context("Writing public key")?;
+ fs::write(&self.public_key, &key_data.publicKey).context("Writing public key")?;
// Unlike when starting an existing instance, we don't need to verify the key, since we
// just generated it and have it in memory.