diff options
| author | Chris Wailes <chriswailes@google.com> | 2021-07-27 16:04:33 -0700 |
|---|---|---|
| committer | Chris Wailes <chriswailes@google.com> | 2021-07-27 16:10:08 -0700 |
| commit | d5aaaef8df81873b4bd9e6cc4e9b4ca71ac30c37 (patch) | |
| tree | 7d9ce5d2646afd6c1bb09bcffa3f13370e257d1f /keystore2/src/raw_device.rs | |
| parent | 04f835ad2f2c443f58d635124724cbc74e3d0d93 (diff) | |
| download | security-d5aaaef8df81873b4bd9e6cc4e9b4ca71ac30c37.tar.gz | |
Fix warnings in preparation for Rust 1.54.0
This CL fixes several new warnings generated by rustc 1.54.0.
Bug: 194812675
Test: m rust
Change-Id: I3076313ea51c6f4e74029ad9fb45d6f0b6dea460
Diffstat (limited to 'keystore2/src/raw_device.rs')
| -rw-r--r-- | keystore2/src/raw_device.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keystore2/src/raw_device.rs b/keystore2/src/raw_device.rs index 8cef84df..991535f4 100644 --- a/keystore2/src/raw_device.rs +++ b/keystore2/src/raw_device.rs @@ -120,7 +120,7 @@ impl KeyMintDevice { blob_metadata.add(BlobMetaEntry::KmUuid(self.km_uuid)); db.store_new_key( - &key_desc, + key_desc, key_type, &key_parameters, &(&creation_result.keyBlob, &blob_metadata), @@ -148,7 +148,7 @@ impl KeyMintDevice { key_desc: &KeyDescriptor, key_type: KeyType, ) -> Result<(KeyIdGuard, KeyEntry)> { - db.load_key_entry(&key_desc, key_type, KeyEntryLoadBits::KM, AID_KEYSTORE, |_, _| Ok(())) + db.load_key_entry(key_desc, key_type, KeyEntryLoadBits::KM, AID_KEYSTORE, |_, _| Ok(())) .context("In lookup_from_desc: load_key_entry failed.") } @@ -228,8 +228,8 @@ impl KeyMintDevice { }; } - self.create_and_store_key(db, &key_desc, key_type, |km_dev| { - km_dev.generateKey(¶ms, None) + self.create_and_store_key(db, key_desc, key_type, |km_dev| { + km_dev.generateKey(params, None) }) .context("In lookup_or_generate_key: generate_and_store_key failed")?; Self::lookup_from_desc(db, key_desc, key_type) |