Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0207dc3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4937098 from 0dba8886 to pi-qpr1-release 

Change-Id: I32e7fcde9b7579ef9e311a3cc4d52a8675cedc40
parents 93688c0c 0dba8886

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+8 −8
Original line number Diff line number Diff line
@@ -1911,14 +1911,14 @@ class ImportWrappedKeyTest : public KeymasterHidlTest {}; 
TEST_F(ImportWrappedKeyTest, Success) {

    auto wrapping_key_desc = AuthorizationSetBuilder()

                                 .RsaEncryptionKey(2048, 65537)

                                 .Digest(Digest::SHA_2_256)

                                 .Digest(Digest::SHA1)

                                 .Padding(PaddingMode::RSA_OAEP)

                                 .Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY);



    ASSERT_EQ(ErrorCode::OK,

              ImportWrappedKey(

                  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!";

    auto params = AuthorizationSetBuilder().BlockMode(BlockMode::ECB).Padding(PaddingMode::PKCS7);
@@ -1930,39 +1930,39 @@ TEST_F(ImportWrappedKeyTest, Success) { 
TEST_F(ImportWrappedKeyTest, SuccessMasked) {

    auto wrapping_key_desc = AuthorizationSetBuilder()

                                 .RsaEncryptionKey(2048, 65537)

                                 .Digest(Digest::SHA_2_256)

                                 .Digest(Digest::SHA1)

                                 .Padding(PaddingMode::RSA_OAEP)

                                 .Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY);



    ASSERT_EQ(ErrorCode::OK,

              ImportWrappedKey(

                  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) {

    auto wrapping_key_desc = AuthorizationSetBuilder()

                                 .RsaEncryptionKey(2048, 65537)

                                 .Digest(Digest::SHA_2_256)

                                 .Digest(Digest::SHA1)

                                 .Padding(PaddingMode::RSA_OAEP)

                                 .Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY);



    ASSERT_EQ(ErrorCode::VERIFICATION_FAILED,

              ImportWrappedKey(

                  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) {

    auto wrapping_key_desc = AuthorizationSetBuilder()

                                 .RsaEncryptionKey(2048, 65537)

                                 .Digest(Digest::SHA_2_256)

                                 .Digest(Digest::SHA1)

                                 .Padding(PaddingMode::RSA_OAEP);



    ASSERT_EQ(ErrorCode::INCOMPATIBLE_PURPOSE,

              ImportWrappedKey(

                  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;