commit ba2c64bf7bf9cd353b6444511d0138d7187d946e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 26 02:19:45 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 26 02:19:45 2022 +0000
tree b7c684f0f81d580eb11c86308a5c7813ad5e7d87
parent df680620027badb4cd7b70a1d185edba384469f9
parent 583348d08f4eec5999f400fb86e19020a76a9ac9

Merge "KeyMint VTS: Use a strongbox must support DIGEST for importKey" am: 768f3b6f92 am: 583348d08f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2268367

Change-Id: I5b1cb3ddc8ab23b041856ff1fd0e6fb4bc2304b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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)));
 }