commit 7e9dfba159a681823700b82cea60ff03ecc0b413
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 23 18:42:57 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 23 18:42:57 2021 +0000
tree 8aaafd8df5e70fc13f3f36620d77baaadf62f6af
parent 2ac2bbb546b8028c2c7f5a9a7567a477eaa6ce64
parent e204f3d1fef7c25499b6108f58fa005766e4b78e

Merge "Keystore 2.0: Fix convertStorageKeyToEphemenral" into sc-dev

keystore2/src/security_level.rs

diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index 365f8da..5cb3afc 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -914,7 +914,7 @@
                         "In convert_storage_key_to_ephemeral: calling convertStorageKeyToEphemeral (2)",
                         500,
                     );
-                    map_km_error(km_dev.convertStorageKeyToEphemeral(key_blob))
+                    map_km_error(km_dev.convertStorageKeyToEphemeral(&upgraded_blob))
                 }
                     .context(concat!(
                         "In convert_storage_key_to_ephemeral: ",