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

Commit 583348d0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I71c97e1a009eba58c69c60e86aef428201d36b24
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c343b02c 768f3b6f

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

+2 −2
Original line number Diff line number Diff line
@@ -4946,15 +4946,15 @@ TEST_P(ImportWrappedKeyTest, WrongPaddingMode) { 
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)));

}