| commit | 64e8e729630d53ffd53d20130c45382e1ff18489 | [log] [tgz] |
|---|---|---|
| author | Bill Richardson <wfrichar@google.com> | Tue Mar 02 00:52:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 00:52:26 2021 +0000 |
| tree | 6f4de79b0aa6d9df4408bd5a0153577d9d0515c7 | |
| parent | b7e78727989e952dcee65cf45ec456a2bc728fbb [diff] | |
| parent | 478715818f36f9660164b063f01497b6742accc8 [diff] |
Fix segfault in EncryptionOperationsTest.RsaPkcs1Success am: 478715818f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1607102 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8e18c84d8bf699f6a6980d83aa3fd5f3859859c5
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());