diff --git a/security/keymint/aidl/vts/functional/AuthTest.cpp b/security/keymint/aidl/vts/functional/AuthTest.cpp index 290e8fcf64..ecaee11f6f 100644 --- a/security/keymint/aidl/vts/functional/AuthTest.cpp +++ b/security/keymint/aidl/vts/functional/AuthTest.cpp @@ -453,8 +453,18 @@ TEST_P(AuthTest, TimeoutAuthenticationMultiSid) { vector keyblob; vector key_characteristics; vector cert_chain; - ASSERT_EQ(ErrorCode::OK, - GenerateKey(builder, std::nullopt, &keyblob, &key_characteristics, &cert_chain)); + auto result = GenerateKey(builder, std::nullopt, &keyblob, &key_characteristics, &cert_chain); + if (SecLevel() == SecurityLevel::STRONGBOX) { + if (result == ErrorCode::ATTESTATION_KEYS_NOT_PROVISIONED) { + result = GenerateKeyWithSelfSignedAttestKey(AuthorizationSetBuilder() + .EcdsaKey(EcCurve::P_256) + .AttestKey() + .SetDefaultValidity(), + builder, &keyblob, &key_characteristics, + &cert_chain); + } + } + ASSERT_EQ(ErrorCode::OK, result); // Verify first user to get a HAT that should work. const uint64_t challenge = 42;