diff options
| author | Jocelyn Bohr <bohr@chromium.org> | 2015-08-10 16:24:34 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-08-11 02:28:41 +0000 |
| commit | 2d0870476357df22a81109512c0e8c3d5ecacfa6 (patch) | |
| tree | f0011e70fc738f32194729b4fb4581057b6d15cb /tpm_generated.c | |
| parent | 7cba233744eb02495f33aab5e5f28efbff87075d (diff) | |
| download | tpm2-2d0870476357df22a81109512c0e8c3d5ecacfa6.tar.gz | |
Change fields named xor to xor_.
Compiling a C++ file with libtpm2 results in an error because xor is a
keyword in C++. This patches the source code to change instances of
fields with name xor to xor_.
TEST=$ sudo emerge tpm2
builds libtpm2.a
BUG=none
CQ-DEPEND=292439
Change-Id: I59ac3dd78d27edb0b7f4e86d7e2dc93f7f58db1c
Reviewed-on: https://chromium-review.googlesource.com/292472
Reviewed-by: Utkarsh Sanghi <usanghi@chromium.org>
Commit-Queue: Jocelyn Bohr <bohr@chromium.org>
Tested-by: Jocelyn Bohr <bohr@chromium.org>
Diffstat (limited to 'tpm_generated.c')
| -rw-r--r-- | tpm_generated.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tpm_generated.c b/tpm_generated.c index 5e7e60b..ead8c5d 100644 --- a/tpm_generated.c +++ b/tpm_generated.c @@ -5799,7 +5799,7 @@ UINT16 TPMU_SYM_KEY_BITS_Marshal(TPMU_SYM_KEY_BITS* source, #endif #ifdef TPM_ALG_XOR case TPM_ALG_XOR: - return TPMI_ALG_HASH_Marshal((TPMI_ALG_HASH*)&source->xor, buffer, size); + return TPMI_ALG_HASH_Marshal((TPMI_ALG_HASH*)&source->xor_, buffer, size); #endif } return 0; @@ -5822,7 +5822,7 @@ TPM_RC TPMU_SYM_KEY_BITS_Unmarshal(TPMU_SYM_KEY_BITS* target, #endif #ifdef TPM_ALG_XOR case TPM_ALG_XOR: - return TPMI_ALG_HASH_Unmarshal(&target->xor, buffer, size, FALSE); + return TPMI_ALG_HASH_Unmarshal(&target->xor_, buffer, size, FALSE); #endif } return TPM_RC_SELECTOR; @@ -6114,7 +6114,7 @@ UINT16 TPMU_SCHEME_KEYEDHASH_Marshal(TPMU_SCHEME_KEYEDHASH* source, #endif #ifdef TPM_ALG_XOR case TPM_ALG_XOR: - return TPMS_SCHEME_XOR_Marshal((TPMS_SCHEME_XOR*)&source->xor, buffer, + return TPMS_SCHEME_XOR_Marshal((TPMS_SCHEME_XOR*)&source->xor_, buffer, size); #endif } @@ -6133,7 +6133,7 @@ TPM_RC TPMU_SCHEME_KEYEDHASH_Unmarshal(TPMU_SCHEME_KEYEDHASH* target, #endif #ifdef TPM_ALG_XOR case TPM_ALG_XOR: - return TPMS_SCHEME_XOR_Unmarshal((TPMS_SCHEME_XOR*)&target->xor, buffer, + return TPMS_SCHEME_XOR_Unmarshal((TPMS_SCHEME_XOR*)&target->xor_, buffer, size); #endif } |