commit 600321ad19d0c5f068118113ec22bf4503bdf1fe
author Janis Danisevskis <jdanis@google.com> Thu Sep 30 16:15:25 2021 +0000
committer Janis Danisevskis <jdanis@google.com> Thu Sep 30 16:15:25 2021 +0000
tree 58070c3ec182ac500ebd81766371e109331dfbfa
parent bcb469a7541f9bea1226fb1c0c935658e1f4f7b0

Revert "Keystore 2.0 km_compat: Cuttlefish does not return a vendor patch level."

This reverts commit bcb469a7541f9bea1226fb1c0c935658e1f4f7b0.

Reason for revert: Cuttlefish's KM implementation was fixed.

Change-Id: Id16433fee1994594344f0c33d6d627bfbd144dc9

keystore2/src/km_compat/lib.rs

diff --git a/keystore2/src/km_compat/lib.rs b/keystore2/src/km_compat/lib.rs
index 8abf2ba..8d7310b 100644
--- a/keystore2/src/km_compat/lib.rs
+++ b/keystore2/src/km_compat/lib.rs
@@ -450,6 +450,10 @@
         )));
         assert!(sec_level_enforced.iter().any(|kp| matches!(
             kp,
+            KeyParameter { tag: Tag::VENDOR_PATCHLEVEL, value: KeyParameterValue::Integer(_) }
+        )));
+        assert!(sec_level_enforced.iter().any(|kp| matches!(
+            kp,
             KeyParameter { tag: Tag::BOOT_PATCHLEVEL, value: KeyParameterValue::Integer(_) }
         )));
     }