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

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

Change-Id: I71c97e1a009eba58c69c60e86aef428201d36b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-10-26 01:45:28 +00:00
committed by Automerger Merge Worker

View File

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