commit 768f3b6f92156f3d1e586a6e968b5b575c4816c0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 26 01:08:43 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 26 01:08:43 2022 +0000
tree b29c159f539d144a9a162bf265a86ce6ccbea0be
parent b65be73e86c1b17ec5019ae40fcb31bf901f709a
parent 4fdcccc7c0cd2eef11123ab776ba4696d4a1584d

Merge "KeyMint VTS: Use a strongbox must support DIGEST for importKey"

security/keymint/aidl/vts/functional/KeyMintTest.cpp

diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
index 4f5d821..2194529 100644
--- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -4946,15 +4946,15 @@
 TEST_P(ImportWrappedKeyTest, WrongDigest) {
     auto wrapping_key_desc = AuthorizationSetBuilder()
                                      .RsaEncryptionKey(2048, 65537)
-                                     .Digest(Digest::SHA_2_512)
                                      .Padding(PaddingMode::RSA_OAEP)
+                                     .Digest(Digest::SHA_2_256)
                                      .Authorization(TAG_PURPOSE, KeyPurpose::WRAP_KEY)
                                      .SetDefaultValidity();
 
     ASSERT_EQ(ErrorCode::INCOMPATIBLE_DIGEST,
               ImportWrappedKey(wrapped_key, wrapping_key, wrapping_key_desc, zero_masking_key,
                                AuthorizationSetBuilder()
-                                       .Digest(Digest::SHA_2_256)
+                                       .Digest(Digest::SHA_2_512)
                                        .Padding(PaddingMode::RSA_OAEP)));
 }