commit 84af4d1bf9db6ac1bf1a10d2d5bc3f03e36d79b2
author Janis Danisevskis <jdanis@google.com> Thu Jul 22 17:39:15 2021 -0700
committer Janis Danisevskis <jdanis@google.com> Thu Jul 22 18:55:15 2021 -0700
tree 587ad4ddc151279f32003efa3d836a4fe79b8045
parent 978b373fb5ed7766ea681385d2c8be11c6e9c8b4

Keystore 2.0: Fix convertStorageKeyToEphemenral

Version binding of storage keys was broken in that the old keyblob was
passed to the KM backed instead of the upgraded key blob when an upgrade
was required.

Bug: 194444841
Bug: 187304488
Test: N/A
Change-Id: Iad3e9d4c0de2f8c7121147c81590e56663fe596f

keystore2/src/security_level.rs

diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index b66c778..e0eabe1 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -907,7 +907,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: ",