commit 4ef2802a9bf518acc33a108f153535270df962c6
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 27 23:04:09 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 27 23:04:09 2021 +0000
tree 4cc9c95d7466fde5f3318addf1bafb301fcf16b9
parent d644edaa37376d86e29c8331540f481a90ab96c2
parent f2ff9c8ee9db8dcba6c997d11e35f0955851fb27

Merge "Keystore 2.0 engine: Handle legacy PEM certificates."

keystore2/Android.bp

diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 7c4f61b..7f1d15d 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -48,11 +48,11 @@
         "libkeystore2_vintf_rust",
         "liblazy_static",
         "liblibc",
-        "liblibsqlite3_sys",
+        "liblibsqlite3_sys_noicu",
         "liblog_event_list",
         "liblog_rust",
         "librand",
-        "librusqlite",
+        "librusqlite_noicu",
         "librustutils",
         "libthiserror",
     ],
@@ -153,7 +153,6 @@
         "libc",
         "libdl_android",
         "libdl",
-        "libandroidicu",
         "libkeymint",
         "libkeystore2_aaid",
         "libkeystore2_apc_compat",

keystore2/legacykeystore/Android.bp

diff --git a/keystore2/legacykeystore/Android.bp b/keystore2/legacykeystore/Android.bp
index da6aa8a..62d593c 100644
--- a/keystore2/legacykeystore/Android.bp
+++ b/keystore2/legacykeystore/Android.bp
@@ -33,7 +33,7 @@
         "libbinder_rs",
         "libkeystore2",
         "liblog_rust",
-        "librusqlite",
+        "librusqlite_noicu",
         "librustutils",
         "libthiserror",
     ],
@@ -52,7 +52,7 @@
         "libkeystore2",
         "libkeystore2_test_utils",
         "liblog_rust",
-        "librusqlite",
+        "librusqlite_noicu",
         "librustutils",
         "libthiserror",
     ],

keystore2/src/km_compat/lib.rs

diff --git a/keystore2/src/km_compat/lib.rs b/keystore2/src/km_compat/lib.rs
index 8d7310b..8abf2ba 100644
--- a/keystore2/src/km_compat/lib.rs
+++ b/keystore2/src/km_compat/lib.rs
@@ -450,10 +450,6 @@
         )));
         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(_) }
         )));
     }