aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagendra modadugu <ngm@google.com>2016-02-04 22:47:45 -0800
committerchrome-bot <chrome-bot@chromium.org>2016-02-05 17:30:28 +0000
commitd93651340e362a54ae148899a0106d55aaf04b8e (patch)
tree8449e44197315ece153129d38c379e6e47d6f2ec
parent0994ac92f207a6dd4cb6b9af4d9d39d6bc083d59 (diff)
downloadtpm2-d93651340e362a54ae148899a0106d55aaf04b8e.tar.gz
Revert "Temporarily add padding to nested struct to ensure word alignment."
This reverts commit 821d29792def7d472b92464d56dde6d733af7f30. BRANCH=none BUG=chrome-os-partner:43025,chrome-os-partner:47524,chrome-os-partner:49770 TEST=compiles, CR50 tests pass Change-Id: Ibde197d3dd2b4ca9a0cdde51590a74bf0fd73b27 Signed-off-by: nagendra modadugu <ngm@google.com> Reviewed-on: https://chromium-review.googlesource.com/326181 Commit-Ready: Nagendra Modadugu <ngm@google.com> Tested-by: Nagendra Modadugu <ngm@google.com> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
-rw-r--r--tpm_types.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/tpm_types.h b/tpm_types.h
index 56af630..eec5e48 100644
--- a/tpm_types.h
+++ b/tpm_types.h
@@ -1265,13 +1265,10 @@ typedef union {
} TPM2B_ECC_PARAMETER;
// Table 162 Definition of TPMS_ECC_POINT Structure
-// TODO(ngm): To be fixed in the generator, crbug.com/49770.
typedef struct {
- UINT16 unused_pad1;
TPM2B_ECC_PARAMETER x;
- UINT16 unused_pad2;
TPM2B_ECC_PARAMETER y;
-} TPMS_ECC_POINT __attribute__ ((aligned (4)));
+} TPMS_ECC_POINT;
// Table 163 Definition of TPM2B_ECC_POINT Structure
typedef union {