commit 5d27fbb12daac5814b60f8d20080ddf87002234b
author Janis Danisevskis <jdanis@google.com> Thu Jan 21 16:36:18 2021 -0800
committer Janis Danisevskis <jdanis@google.com> Tue Jan 26 15:24:28 2021 -0800
tree 914fd0660e29e2b4ca26afc8bca761d201914aca
parent 5ba09513562b48c85a6d25aa90799d6f095b53b6

Keystore 2.0: Fix wrong check on wrapped key import.

Test: Keystore CTS Wrapped key import test.
Change-Id: Id613505112708041554ffa53e23a4e0bd69fa051

keystore2/src/security_level.rs

diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index eb21aea..7eb53c6 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -393,7 +393,7 @@
         params: &[KeyParameter],
         authenticators: &[AuthenticatorSpec],
     ) -> Result<KeyMetadata> {
-        if key.domain != Domain::BLOB && key.alias.is_none() {
+        if !(key.domain == Domain::BLOB && key.alias.is_some()) {
             return Err(error::Error::Km(ErrorCode::INVALID_ARGUMENT))
                 .context("In import_wrapped_key: Alias must be specified.");
         }