commit 44c388800b634136801d89164b3a1cf94c6d1c88
author Shawn Willden <swillden@google.com> Mon Dec 21 18:35:13 2020 -0700
committer Shawn Willden <swillden@google.com> Wed Feb 17 07:59:06 2021 -0700
tree 3033affe353306491e373d6794345b3c5d7ea55d
parent b655685e36f8bd70e9b9b1fc7cf94e41f88a6a86

Add ATTEST_KEY support

Bug: 171845787
Test: VtsAidlKeyMintTargetTest
Change-Id: Ibe71167497874711ebabf38c6b45a6c098e5089a

ng/AndroidKeyMintDevice.cpp

diff --git a/ng/AndroidKeyMintDevice.cpp b/ng/AndroidKeyMintDevice.cpp
index 52cad22..fec6079 100644
--- a/ng/AndroidKeyMintDevice.cpp
+++ b/ng/AndroidKeyMintDevice.cpp
@@ -215,10 +215,18 @@
 }
 
 ScopedAStatus AndroidKeyMintDevice::generateKey(const vector<KeyParameter>& keyParams,
+                                                const optional<AttestationKey>& attestationKey,
                                                 KeyCreationResult* creationResult) {
 
     GenerateKeyRequest request(impl_->message_version());
     request.key_description.Reinitialize(KmParamSet(keyParams));
+    if (attestationKey) {
+        request.attestation_signing_key_blob =
+            KeymasterKeyBlob(attestationKey->keyBlob.data(), attestationKey->keyBlob.size());
+        request.attest_key_params.Reinitialize(KmParamSet(attestationKey->attestKeyParams));
+        request.issuer_subject = KeymasterBlob(attestationKey->issuerSubjectName.data(),
+                                               attestationKey->issuerSubjectName.size());
+    }
 
     GenerateKeyResponse response(impl_->message_version());
     impl_->GenerateKey(request, &response);
@@ -245,12 +253,20 @@
 
 ScopedAStatus AndroidKeyMintDevice::importKey(const vector<KeyParameter>& keyParams,
                                               KeyFormat keyFormat, const vector<uint8_t>& keyData,
+                                              const optional<AttestationKey>& attestationKey,
                                               KeyCreationResult* creationResult) {
 
     ImportKeyRequest request(impl_->message_version());
     request.key_description.Reinitialize(KmParamSet(keyParams));
     request.key_format = legacy_enum_conversion(keyFormat);
     request.key_data = KeymasterKeyBlob(keyData.data(), keyData.size());
+    if (attestationKey) {
+        request.attestation_signing_key_blob =
+            KeymasterKeyBlob(attestationKey->keyBlob.data(), attestationKey->keyBlob.size());
+        request.attest_key_params.Reinitialize(KmParamSet(attestationKey->attestKeyParams));
+        request.issuer_subject = KeymasterBlob(attestationKey->issuerSubjectName.data(),
+                                               attestationKey->issuerSubjectName.size());
+    }
 
     ImportKeyResponse response(impl_->message_version());
     impl_->ImportKey(request, &response);
@@ -267,12 +283,13 @@
     return ScopedAStatus::ok();
 }
 
-ScopedAStatus AndroidKeyMintDevice::importWrappedKey(const vector<uint8_t>& wrappedKeyData,
-                                                     const vector<uint8_t>& wrappingKeyBlob,
-                                                     const vector<uint8_t>& maskingKey,
-                                                     const vector<KeyParameter>& unwrappingParams,
-                                                     int64_t passwordSid, int64_t biometricSid,
-                                                     KeyCreationResult* creationResult) {
+ScopedAStatus
+AndroidKeyMintDevice::importWrappedKey(const vector<uint8_t>& wrappedKeyData,         //
+                                       const vector<uint8_t>& wrappingKeyBlob,        //
+                                       const vector<uint8_t>& maskingKey,             //
+                                       const vector<KeyParameter>& unwrappingParams,  //
+                                       int64_t passwordSid, int64_t biometricSid,     //
+                                       KeyCreationResult* creationResult) {
 
     ImportWrappedKeyRequest request(impl_->message_version());
     request.SetWrappedMaterial(wrappedKeyData.data(), wrappedKeyData.size());