commit 398e6bed8d43e9753333a86bfb7c40541f417d28
author Janis Danisevskis <jdanis@google.com> Thu Dec 17 09:29:25 2020 -0800
committer Janis Danisevskis <jdanis@google.com> Fri Dec 18 12:18:32 2020 -0800
tree f210545b85c1c843803995c728911ca1ff0481af
parent cf550ed45f320de6cc4f9441fe833b08c5a2ab2c

Keystore 2.0: Switch to AIDL union KeyParameters

Test: keystore2_test
Change-Id: Ic5df171197d6161b964996f1faf563daadf57adf

keystore2/src/operation.rs

diff --git a/keystore2/src/operation.rs b/keystore2/src/operation.rs
index 13a9b0c..6f5fac5 100644
--- a/keystore2/src/operation.rs
+++ b/keystore2/src/operation.rs
@@ -136,7 +136,8 @@
 use crate::utils::Asp;
 use android_hardware_security_keymint::aidl::android::hardware::security::keymint::{
     ByteArray::ByteArray, IKeyMintOperation::IKeyMintOperation,
-    KeyParameter::KeyParameter as KmParam, KeyParameterArray::KeyParameterArray, Tag::Tag,
+    KeyParameter::KeyParameter as KmParam, KeyParameterArray::KeyParameterArray,
+    KeyParameterValue::KeyParameterValue as KmParamValue, Tag::Tag,
 };
 use android_system_keystore2::aidl::android::system::keystore2::{
     IKeystoreOperation::BnKeystoreOperation, IKeystoreOperation::IKeystoreOperation,
@@ -319,8 +320,7 @@
         let params = KeyParameterArray {
             params: vec![KmParam {
                 tag: Tag::ASSOCIATED_DATA,
-                blob: aad_input.into(),
-                ..Default::default()
+                value: KmParamValue::Blob(aad_input.into()),
             }],
         };