tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes Ic8949e22,Ia3a6363d am: da2b9ae9f8

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1694706

Change-Id: Ie1a7951c7b3a6fc5d7978ece75c1791efac95029
This commit is contained in:
Shawn Willden 2021-05-04 20:09:27 +00:00 committed by Automerger Merge Worker
commit 8226694fcf
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
security/keymint/aidl/vts/functional/AttestKeyTest.cpp
View file

@ -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;
@ -549,6 +550,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;
@ -632,6 +634,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));

4
security/keymint/aidl/vts/functional/DeviceUniqueAttestationTest.cpp
View file

@ -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);
}
/*