diff options
| author | David Drysdale <drysdale@google.com> | 2022-04-11 13:16:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-11 13:16:23 +0000 |
| commit | 2c19304e56e71ea7275a662dbf921fc8b437c41a (patch) | |
| tree | b8624e3cf854522db1547d7b0db2185cafcbeb3c /keymaster | |
| parent | 8431b21a7bae08f1b92fd7671a7397d9eb00e972 (diff) | |
| parent | 2e449950d6279b2c72f005ea6fb88879d24a931f (diff) | |
Merge "Fix AES corrupt padding test" am: b474607b7c am: b661792d06 am: 2e449950d6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2059787
Change-Id: I1a4bf228d73452cbc718ab126165bf09e0cdf833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'keymaster')
| -rw-r--r-- | keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp index 22aa0f9b3d..bf568600d6 100644 --- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp @@ -2866,8 +2866,8 @@ TEST_P(EncryptionOperationsTest, AesEcbPkcs7PaddingCorrupted) { EXPECT_EQ(ErrorCode::OK, Begin(KeyPurpose::DECRYPT, params)); string plaintext; - ErrorCode error = Finish(message, &plaintext); - if (error == ErrorCode::INVALID_INPUT_LENGTH) { + ErrorCode error = Finish(ciphertext, &plaintext); + if (error == ErrorCode::INVALID_ARGUMENT) { // This is the expected error, we can exit the test now. return; } else { |