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

Merge "KeyMint VTS: allow for stricter SharedSecret impls" into sc-dev

Browse source
This commit is contained in:
David Drysdale 2021-06-29 05:49:21 +00:00 committed by Android (Google) Code Review
commit 8e8698913a
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
security/sharedsecret/aidl/vts/functional/SharedSecretAidlTest.cpp
View file

@ -268,10 +268,16 @@ TEST_F(SharedSecretAidlTest, ComputeSharedSecretShortNonce) {
<< "Shared secret service that provided tweaked param should fail to compute "
"shared secret";
} else {
EXPECT_EQ(ErrorCode::OK, responses[i].error) << "Others should succeed";
EXPECT_NE(correct_response, responses[i].sharing_check)
<< "Others should calculate a different shared secret, due to the tweaked "
"nonce.";
// Other services *may* succeed, or may notice the invalid size for the nonce.
// However, if another service completes the computation, it should get the 'wrong'
// answer.
if (responses[i].error == ErrorCode::OK) {
EXPECT_NE(correct_response, responses[i].sharing_check)
<< "Others should calculate a different shared secret, due to the tweaked "
"nonce.";
} else {
EXPECT_EQ(ErrorCode::INVALID_ARGUMENT, responses[i].error);
}
}
}
}
@ -348,10 +354,16 @@ TEST_F(SharedSecretAidlTest, ComputeSharedSecretShortSeed) {
<< "Shared secret service that provided tweaked param should fail to compute "
"shared secret";
} else {
EXPECT_EQ(ErrorCode::OK, responses[i].error) << "Others should succeed";
EXPECT_NE(correct_response, responses[i].sharing_check)
<< "Others should calculate a different shared secret, due to the tweaked "
"nonce.";
// Other services *may* succeed, or may notice the invalid size for the seed.
// However, if another service completes the computation, it should get the 'wrong'
// answer.
if (responses[i].error == ErrorCode::OK) {
EXPECT_NE(correct_response, responses[i].sharing_check)
<< "Others should calculate a different shared secret, due to the tweaked "
"seed.";
} else {
EXPECT_EQ(ErrorCode::INVALID_ARGUMENT, responses[i].error);
}
}
}
}