From c410f6fb44dfbccae6ddf61cd67a6544a6141626 Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Thu, 22 Apr 2021 13:28:45 -0600 Subject: [PATCH 1/2] Make AttestKeyTest not crash if no cert is returned. Test: VtsAidlKeyMintTargetTest Change-Id: Ia3a6363d854742681f684ff989b98b7cfda30746 --- security/keymint/aidl/vts/functional/AttestKeyTest.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp index afb2193887..5cca560ef9 100644 --- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp +++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp @@ -56,6 +56,7 @@ TEST_P(AttestKeyTest, AllRsaSizes) { {} /* attestation signing key */, &attest_key.keyBlob, &attest_key_characteristics, &attest_key_cert_chain)); + ASSERT_GT(attest_key_cert_chain.size(), 0); EXPECT_EQ(attest_key_cert_chain.size(), 1); EXPECT_TRUE(IsSelfSigned(attest_key_cert_chain)) << "Failed on size " << size; @@ -494,6 +495,7 @@ TEST_P(AttestKeyTest, AllEcCurves) { {} /* attestation siging key */, &attest_key.keyBlob, &attest_key_characteristics, &attest_key_cert_chain)); + ASSERT_GT(attest_key_cert_chain.size(), 0); EXPECT_EQ(attest_key_cert_chain.size(), 1); EXPECT_TRUE(IsSelfSigned(attest_key_cert_chain)) << "Failed on curve " << curve; @@ -577,6 +579,7 @@ TEST_P(AttestKeyTest, AttestWithNonAttestKey) { {} /* attestation siging key */, &non_attest_key.keyBlob, &non_attest_key_characteristics, &non_attest_key_cert_chain)); + ASSERT_GT(non_attest_key_cert_chain.size(), 0); EXPECT_EQ(non_attest_key_cert_chain.size(), 1); EXPECT_TRUE(IsSelfSigned(non_attest_key_cert_chain)); From ced5c2c23a17b0960f0c0da49132888b4a3f64ab Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Mon, 26 Apr 2021 17:33:04 -0600 Subject: [PATCH 2/2] Update DeviceUniqueAttestationTest to match spec Test: VtsAidlKeyMintTargetTest Change-Id: Ic8949e223eb7ba2445d4738dcd9b31a1d244bb46 --- .../aidl/vts/functional/DeviceUniqueAttestationTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp index 7009c6ef14..7ed696877d 100644 --- a/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp +++ b/security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp @@ -76,7 +76,7 @@ TEST_P(DeviceUniqueAttestationTest, RsaNonStrongBoxUnimplemented) { .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), &key_blob, &key_characteristics); - ASSERT_TRUE(result == ErrorCode::UNSUPPORTED_TAG); + ASSERT_EQ(result, ErrorCode::INVALID_ARGUMENT); } /* @@ -102,7 +102,7 @@ TEST_P(DeviceUniqueAttestationTest, EcdsaNonStrongBoxUnimplemented) { .Authorization(TAG_DEVICE_UNIQUE_ATTESTATION), &key_blob, &key_characteristics); - ASSERT_TRUE(result == ErrorCode::UNSUPPORTED_TAG); + ASSERT_EQ(result, ErrorCode::INVALID_ARGUMENT); } /*