commit 3c8ea06269dad4b15e7cc8ef6aa7c8d3aefead4f
author David Zeuthen <zeuthen@google.com> Mon Mar 22 21:10:43 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 22 21:10:43 2021 +0000
tree 441db944fb45aa70a7cec466e567e34d35342c42
parent cd3e3883c4c3c750a96b4b20cccb82e0e6566ff2
parent 5100c6aad2dc365e3754f6bdea8d8143dc15dba3

Merge "Add zeuthen@ to system/security/OWNERS"

keystore2/src/security_level.rs

diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index 2ad8fe1..d7a0a12 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -341,6 +341,10 @@
                 0 => None,
                 _ => Some(KeyParameters { keyParameter: begin_result.params }),
             },
+            // An upgraded blob should only be returned if the caller has permission
+            // to use Domain::BLOB keys. If we got to this point, we already checked
+            // that the caller had that permission.
+            upgradedBlob: if key.domain == Domain::BLOB { upgraded_blob } else { None },
         })
     }