commit be01ea59ec4a7a0ada85bc896d00bfc5626382b7
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 27 02:08:56 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 27 02:08:56 2021 +0000
tree 5887476adceec3936306b25268cd9c85a97b9355
parent b0b1b0a04909cd5bd515f189b47e22bd234ab25d
parent 5d27fbb12daac5814b60f8d20080ddf87002234b

Merge "Keystore 2.0: Fix wrong check on wrapped key import."

keystore2/src/security_level.rs

diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index e4b55b4..12b75bf 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -413,7 +413,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.");
         }