aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagendra modadugu <ngm@google.com>2016-01-26 17:10:49 -0800
committerchrome-bot <chrome-bot@chromium.org>2016-01-27 21:42:29 +0000
commit821d29792def7d472b92464d56dde6d733af7f30 (patch)
tree2ca0a1e68ffe92e346c209af48640fa8ec477c13
parentda4274c1c7f5529a209e272c8e59f8f665fa1be6 (diff)
downloadtpm2-821d29792def7d472b92464d56dde6d733af7f30.tar.gz
Temporarily add padding to nested struct to ensure word alignment.
I'll remove this hack Real Soon Now. TEST=compiles, CR50 tests pass BRANCH=none BUG=chrome-os-partner:43025,chrome-os-partner:47524,chrome-os-partner:49770 Change-Id: I18e110ba4fd988abea5e91cb52b4b82ddcf1ec98 Signed-off-by: nagendra modadugu <ngm@google.com> Reviewed-on: https://chromium-review.googlesource.com/323852 Commit-Ready: Nagendra Modadugu <ngm@google.com> Tested-by: Nagendra Modadugu <ngm@google.com> Reviewed-by: Bill Richardson <wfrichar@chromium.org>
-rw-r--r--tpm_types.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/tpm_types.h b/tpm_types.h
index eec5e48..56af630 100644
--- a/tpm_types.h
+++ b/tpm_types.h
@@ -1265,10 +1265,13 @@ 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;
+} TPMS_ECC_POINT __attribute__ ((aligned (4)));
// Table 163 Definition of TPM2B_ECC_POINT Structure
typedef union {