| commit | 504a2af759d2c52aadcb0e2bd6dd909afced699a | [log] [tgz] |
|---|---|---|
| author | Bill Richardson <wfrichar@google.com> | Tue Mar 02 03:48:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 03:48:31 2021 +0000 |
| tree | d81a8bb780731b1a04b23995603158913226ed65 | |
| parent | 78e8f71e2c33d01c182a3744c01886d58353aca5 [diff] | |
| parent | 85eee4de76ed688bdc9e95146349a7c467073561 [diff] |
Fix segfault in EncryptionOperationsTest.RsaPkcs1Success am: 478715818f am: 64e8e72963 am: adb0da89b4 am: 85eee4de76 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1607102 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11690cca05ef87d4b6ba3d221d6820a3daeef5b8
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 b7ec72e..5f81394 100644 --- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -2562,7 +2562,8 @@ string message = "Hello World!"; auto params = AuthorizationSetBuilder().Padding(PaddingMode::RSA_PKCS1_1_5_ENCRYPT); string ciphertext1 = EncryptMessage(message, params); - EXPECT_EQ(2048U / 8, ciphertext1.size()); + // Die here on failure because we try to modify ciphertext1 below + ASSERT_EQ(2048U / 8, ciphertext1.size()) << "Failed to encrypt the message"; string ciphertext2 = EncryptMessage(message, params); EXPECT_EQ(2048U / 8, ciphertext2.size());