Merge "keystone2: Fix check of i2d_re_X509_tbs call"
diff --git a/keystore/legacy_keymaster_device_wrapper.cpp b/keystore/legacy_keymaster_device_wrapper.cpp
index 86d286e..052f394 100644
--- a/keystore/legacy_keymaster_device_wrapper.cpp
+++ b/keystore/legacy_keymaster_device_wrapper.cpp
@@ -532,7 +532,7 @@
sp<IKeymasterDevice> makeSoftwareKeymasterDevice() {
keymaster2_device_t* dev = nullptr;
- dev = (new SoftKeymasterDevice)->keymaster2_device();
+ dev = (new SoftKeymasterDevice(keymaster::KmVersion::KEYMASTER_2))->keymaster2_device();
auto kmrc = ::keymaster::ConfigureDevice(dev);
if (kmrc != KM_ERROR_OK) {
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 9552df5..4e819b8 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -36,8 +36,9 @@
name: "keystore2_test",
crate_name: "keystore2",
srcs: ["src/lib.rs"],
- test_suites: ["general-tests"],
- auto_gen_config: true,
+ test_suites: ["device-tests"],
+ auto_gen_config: false,
+ test_config: "AndroidTest.xml",
rustlibs: [
"android.system.keystore2-rust",
"android.hardware.keymint-rust",
diff --git a/keystore2/AndroidTest.xml b/keystore2/AndroidTest.xml
new file mode 100644
index 0000000..b295947
--- /dev/null
+++ b/keystore2/AndroidTest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration description="Config to run keystore2_test device tests.">
+
+ <option name="test-suite-tag" value="rust-tests" />
+
+ <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+ <option name="cleanup" value="true" />
+ <option name="push" value="keystore2_test->/data/local/tmp/keystore2_test" />
+ </target_preparer>
+
+ <test class="com.android.tradefed.testtype.rust.RustBinaryTest" >
+ <option name="test-device-path" value="/data/local/tmp" />
+ <option name="module-name" value="keystore2_test" />
+ </test>
+</configuration>