commit 2625c8f61630660de96b712c68297dc08d394759
author Mattias Nissler <mnissler@chromium.org> Mon Jun 08 22:53:38 2020 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Jun 09 21:34:06 2020 +0000
tree e2c9c572e9e5cd482c6adaf69455b076b2b20560
parent 0e6574759b343479676b13ae74cadcbeb10921e1

trunks: Initialize public_data in TpmUtilityTest.UnsealDataSuccess

Leaving the value uninitialized can make the test fail due to
TpmUtilityImpl::ComputeKey attempting to access public_area.unique.rsa
with an incorrect size that is larger than the buffer.

BUG=chromium:1091772
TEST=TpmUtilityTest.UnsealData passes consistently when trunks is built against OpenSSL 1.1.1.

Change-Id: Idb3115a2f2281207979c817c16f9862b499bb3b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2235546
Tested-by: Mattias Nissler <mnissler@chromium.org>
Tested-by: Dmitry Torokhov <dtor@chromium.org>
Auto-Submit: Mattias Nissler <mnissler@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Reviewed-by: Leo Lai <cylai@google.com>
Commit-Queue: Dmitry Torokhov <dtor@chromium.org>

trunks/tpm_utility_test.cc

diff --git a/trunks/tpm_utility_test.cc b/trunks/tpm_utility_test.cc
index cf9e9e8..d4c5a92 100644
--- a/trunks/tpm_utility_test.cc
+++ b/trunks/tpm_utility_test.cc
@@ -1994,7 +1994,10 @@
   std::string unsealed_data;
   TPM_HANDLE object_handle = 42;
   TPM2B_PUBLIC public_data;
+  public_data.public_area.type = TPM_ALG_RSA;
+  public_data.public_area.object_attributes = kDecrypt;
   public_data.public_area.auth_policy.size = 0;
+  public_data.public_area.unique.rsa.size = 0;
   EXPECT_CALL(mock_tpm_, ReadPublicSync(_, _, _, _, _, _))
       .WillRepeatedly(
           DoAll(SetArgPointee<2>(public_data), Return(TPM_RC_SUCCESS)));