diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-23 18:59:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-23 18:59:50 +0000 |
| commit | c85f7b2a781f9f7c41432ff4ae8c392fd90dede1 (patch) | |
| tree | 8aaafd8df5e70fc13f3f36620d77baaadf62f6af | |
| parent | 9879ea031f1a264a1d29449c5da86b415e8bb243 (diff) | |
| parent | 7e9dfba159a681823700b82cea60ff03ecc0b413 (diff) | |
| download | security-c85f7b2a781f9f7c41432ff4ae8c392fd90dede1.tar.gz | |
Merge "Keystore 2.0: Fix convertStorageKeyToEphemenral" into sc-dev am: 7e9dfba159
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/15365713
Change-Id: I97a48b673ef8f1ab6ae0ecbe37c47e6a3877116a
| -rw-r--r-- | keystore2/src/security_level.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs index 365f8dac..5cb3afcd 100644 --- a/keystore2/src/security_level.rs +++ b/keystore2/src/security_level.rs @@ -914,7 +914,7 @@ impl KeystoreSecurityLevel { "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: ", |