Merge "Change ImportWrappedKeyTest back to SHA1" into pie-vts-dev
This commit is contained in:
commit
e7300721a0
1 changed files with 8 additions and 8 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue