summaryrefslogtreecommitdiff
path: root/keystore2/test_utils
diff options
context:
space:
mode:
authorRajesh Nyamagoud <nyamagoud@google.com>2022-08-20 01:45:17 +0000
committerRajesh Nyamagoud <nyamagoud@google.com>2022-10-05 18:57:51 +0000
commitc7d064d59f5a28b2477d45ea623883a8271c1acd (patch)
tree257db5f7f7e2b614a2d147cf8fd82cf1904abe6c /keystore2/test_utils
parent7990778df7fde01017e147d082bb92f16593bf39 (diff)
downloadsecurity-c7d064d59f5a28b2477d45ea623883a8271c1acd.tar.gz
Changes made in keystore2_client_tests to avoid test timeout issues.
Added macros to generate test code for RSA and EC keys use cases. Test cases are split to run them in distict test cases to avoid timeout issues. Limiting RSA and EC each test cases to generate only one key and perform an operation. Bug: 242356276 Test: atest keystore2_client_tests Change-Id: I2841734f329afb0005727da26cc5b9ff532b9e73
Diffstat (limited to 'keystore2/test_utils')
-rw-r--r--keystore2/test_utils/key_generations.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/keystore2/test_utils/key_generations.rs b/keystore2/test_utils/key_generations.rs
index 17d89146..c555760d 100644
--- a/keystore2/test_utils/key_generations.rs
+++ b/keystore2/test_utils/key_generations.rs
@@ -112,6 +112,7 @@ pub fn generate_ec_p256_signing_key(
) -> binder::Result<KeyMetadata> {
let mut key_attest = false;
let mut gen_params = AuthSetBuilder::new()
+ .no_auth_required()
.algorithm(Algorithm::EC)
.purpose(KeyPurpose::SIGN)
.purpose(KeyPurpose::VERIFY)
@@ -151,8 +152,8 @@ pub fn generate_ec_p256_signing_key(
}
/// Generate EC signing key.
-pub fn generate_ec_key<S: IKeystoreSecurityLevel + ?Sized>(
- sec_level: &S,
+pub fn generate_ec_key(
+ sec_level: &binder::Strong<dyn IKeystoreSecurityLevel>,
domain: Domain,
nspace: i64,
alias: Option<String>,