commit 2d0870476357df22a81109512c0e8c3d5ecacfa6
author Jocelyn Bohr <bohr@chromium.org> Mon Aug 10 16:24:34 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Aug 11 02:28:41 2015 +0000
tree f0011e70fc738f32194729b4fb4581057b6d15cb
parent 7cba233744eb02495f33aab5e5f28efbff87075d

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>

CryptUtil.c

diff --git a/CryptUtil.c b/CryptUtil.c
index 1f094c1..6a675ec 100644
--- a/CryptUtil.c
+++ b/CryptUtil.c
@@ -709,7 +709,7 @@
    if(scheme->scheme == TPM_ALG_NULL)
        hashAlg = publicArea->nameAlg;
    else if(scheme->scheme == TPM_ALG_XOR)
-       hashAlg = scheme->details.xor.hashAlg;
+       hashAlg = scheme->details.xor_.hashAlg;
    else
        hashAlg = scheme->details.hmac.hashAlg;
    hashBlockSize = CryptGetHashBlockSize(hashAlg);