diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-06-02 16:53:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-02 16:53:08 +0000 |
| commit | 29c8bbc4546e865f5543e4b22b509d4653ac8408 (patch) | |
| tree | a10e844a5cd50ea6a1089e9656766b0535510188 | |
| parent | b1da7e7215ad4814753bbd47b53892b5a68ab42e (diff) | |
| parent | 83bf24225ca6625a4f8a59083223cd3a6dce7efe (diff) | |
| download | security-29c8bbc4546e865f5543e4b22b509d4653ac8408.tar.gz | |
Keystore 2.0: Boot level key: Add missing digest to operation params am: 83bf24225c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/14748314
Change-Id: Ibddd38e0e3feaf77388550a02503b4d10918d9cb
| -rw-r--r-- | keystore2/src/boot_level_keys.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/keystore2/src/boot_level_keys.rs b/keystore2/src/boot_level_keys.rs index 0df3a457..1110caf9 100644 --- a/keystore2/src/boot_level_keys.rs +++ b/keystore2/src/boot_level_keys.rs @@ -99,7 +99,10 @@ pub fn get_level_zero_key(db: &mut KeystoreDB) -> Result<ZVec> { }) .context("In get_level_zero_key: lookup_or_generate_key failed")?; - let params = [KeyParameterValue::MacLength(256).into()]; + let params = [ + KeyParameterValue::MacLength(256).into(), + KeyParameterValue::Digest(Digest::SHA_2_256).into(), + ]; let level_zero_key = km_dev .use_key_in_one_step( db, |