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

Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev

Browse source
This commit is contained in:
Treehugger Robot 2018-08-29 08:07:09 +00:00 committed by Gerrit Code Review
commit e7300721a0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
View file

@ -1911,14 +1911,14 @@ class ImportWrappedKeyTest : public KeymasterHidlTest {};
TEST_F(ImportWrappedKeyTest, Success) { TEST_F(ImportWrappedKeyTest, Success) {
auto wrapping_key_desc = AuthorizationSetBuilder() auto wrapping_key_desc = AuthorizationSetBuilder()
.RsaEncryptionKey(2048, 65537) .RsaEncryptionKey(2048, 65537)
.Digest(Digest::SHA_2_256) .Digest(Digest::SHA1)
.Padding(PaddingMode::RSA_OAEP) .Padding(PaddingMode::RSA_OAEP)
.Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY); .Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY);
ASSERT_EQ(ErrorCode::OK, ASSERT_EQ(ErrorCode::OK,
ImportWrappedKey( ImportWrappedKey(
wrapped_key, wrapping_key, wrapping_key_desc, zero_masking_key, wrapped_key, wrapping_key, wrapping_key_desc, zero_masking_key,
AuthorizationSetBuilder().Digest(Digest::SHA_2_256).Padding(PaddingMode::RSA_OAEP))); AuthorizationSetBuilder().Digest(Digest::SHA1).Padding(PaddingMode::RSA_OAEP)));
string message = "Hello World!"; string message = "Hello World!";
auto params = AuthorizationSetBuilder().BlockMode(BlockMode::ECB).Padding(PaddingMode::PKCS7); auto params = AuthorizationSetBuilder().BlockMode(BlockMode::ECB).Padding(PaddingMode::PKCS7);
@ -1930,39 +1930,39 @@ TEST_F(ImportWrappedKeyTest, Success) {
TEST_F(ImportWrappedKeyTest, SuccessMasked) { TEST_F(ImportWrappedKeyTest, SuccessMasked) {
auto wrapping_key_desc = AuthorizationSetBuilder() auto wrapping_key_desc = AuthorizationSetBuilder()
.RsaEncryptionKey(2048, 65537) .RsaEncryptionKey(2048, 65537)
.Digest(Digest::SHA_2_256) .Digest(Digest::SHA1)
.Padding(PaddingMode::RSA_OAEP) .Padding(PaddingMode::RSA_OAEP)
.Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY); .Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY);
ASSERT_EQ(ErrorCode::OK, ASSERT_EQ(ErrorCode::OK,
ImportWrappedKey( ImportWrappedKey(
wrapped_key_masked, wrapping_key, wrapping_key_desc, masking_key, wrapped_key_masked, wrapping_key, wrapping_key_desc, masking_key,
AuthorizationSetBuilder().Digest(Digest::SHA_2_256).Padding(PaddingMode::RSA_OAEP))); AuthorizationSetBuilder().Digest(Digest::SHA1).Padding(PaddingMode::RSA_OAEP)));
} }
TEST_F(ImportWrappedKeyTest, WrongMask) { TEST_F(ImportWrappedKeyTest, WrongMask) {
auto wrapping_key_desc = AuthorizationSetBuilder() auto wrapping_key_desc = AuthorizationSetBuilder()
.RsaEncryptionKey(2048, 65537) .RsaEncryptionKey(2048, 65537)
.Digest(Digest::SHA_2_256) .Digest(Digest::SHA1)
.Padding(PaddingMode::RSA_OAEP) .Padding(PaddingMode::RSA_OAEP)
.Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY); .Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY);
ASSERT_EQ(ErrorCode::VERIFICATION_FAILED, ASSERT_EQ(ErrorCode::VERIFICATION_FAILED,
ImportWrappedKey( ImportWrappedKey(
wrapped_key_masked, wrapping_key, wrapping_key_desc, zero_masking_key, wrapped_key_masked, wrapping_key, wrapping_key_desc, zero_masking_key,
AuthorizationSetBuilder().Digest(Digest::SHA_2_256).Padding(PaddingMode::RSA_OAEP))); AuthorizationSetBuilder().Digest(Digest::SHA1).Padding(PaddingMode::RSA_OAEP)));
} }
TEST_F(ImportWrappedKeyTest, WrongPurpose) { TEST_F(ImportWrappedKeyTest, WrongPurpose) {
auto wrapping_key_desc = AuthorizationSetBuilder() auto wrapping_key_desc = AuthorizationSetBuilder()
.RsaEncryptionKey(2048, 65537) .RsaEncryptionKey(2048, 65537)
.Digest(Digest::SHA_2_256) .Digest(Digest::SHA1)
.Padding(PaddingMode::RSA_OAEP); .Padding(PaddingMode::RSA_OAEP);
ASSERT_EQ(ErrorCode::INCOMPATIBLE_PURPOSE, ASSERT_EQ(ErrorCode::INCOMPATIBLE_PURPOSE,
ImportWrappedKey( ImportWrappedKey(
wrapped_key_masked, wrapping_key, wrapping_key_desc, zero_masking_key, wrapped_key_masked, wrapping_key, wrapping_key_desc, zero_masking_key,
AuthorizationSetBuilder().Digest(Digest::SHA_2_256).Padding(PaddingMode::RSA_OAEP))); AuthorizationSetBuilder().Digest(Digest::SHA1).Padding(PaddingMode::RSA_OAEP)));
} }
typedef KeymasterHidlTest EncryptionOperationsTest; typedef KeymasterHidlTest EncryptionOperationsTest;