From 09bf3ed58996b8fe224fbd9319662d6ec44c849f Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Fri, 26 Jun 2020 16:44:05 -0400
Subject: [PATCH] rev162: make union tpmCryptKeySchedule_t a typedef union

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 src/tpm2/crypto/CryptSym.h             | 6 +++---
 src/tpm2/crypto/openssl/TpmToOsslSym.h | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tpm2/crypto/CryptSym.h b/src/tpm2/crypto/CryptSym.h
index 38968d31..817d4f87 100644
--- a/src/tpm2/crypto/CryptSym.h
+++ b/src/tpm2/crypto/CryptSym.h
@@ -3,7 +3,7 @@
 /*		Implementation of the symmetric block cipher modes 		*/
 /*			     Written by Ken Goldman				*/
 /*		       IBM Thomas J. Watson Research Center			*/
-/*            $Id: CryptSym.h 1519 2019-11-15 20:43:51Z kgoldman $		*/
+/*            $Id: CryptSym.h 1618 2020-05-19 15:28:41Z kgoldman $		*/
 /*										*/
 /*  Licenses and Notices							*/
 /*										*/
@@ -63,7 +63,7 @@
 #ifndef CRYPTSYM_H
 #define CRYPTSYM_H
 
-union tpmCryptKeySchedule_t {
+typedef union tpmCryptKeySchedule_t {
 #if ALG_AES
     tpmKeyScheduleAES           AES;
 #endif
@@ -81,7 +81,7 @@ union tpmCryptKeySchedule_t {
 #else
     uint32_t            alignment;
 #endif
-} /* tpmCryptKeySchedule */;   // libtpms changed; causes duplicate symbols on OS X
+} tpmCryptKeySchedule_t;
 /* Each block cipher within a library is expected to conform to the same calling conventions with
    three parameters (keySchedule, in, and out) in the same order. That means that all algorithms
    would use the same order of the same parameters. The code is written assuming the (keySchedule,
diff --git a/src/tpm2/crypto/openssl/TpmToOsslSym.h b/src/tpm2/crypto/openssl/TpmToOsslSym.h
index 90a7f015..521204ff 100644
--- a/src/tpm2/crypto/openssl/TpmToOsslSym.h
+++ b/src/tpm2/crypto/openssl/TpmToOsslSym.h
@@ -3,7 +3,7 @@
 /*		Splice the OpenSSL() library into the TPM code.    		*/
 /*			     Written by Ken Goldman				*/
 /*		       IBM Thomas J. Watson Research Center			*/
-/*            $Id: TpmToOsslSym.h 1600 2020-03-30 22:08:01Z kgoldman $		*/
+/*            $Id: TpmToOsslSym.h 1619 2020-05-19 16:51:47Z kgoldman $		*/
 /*										*/
 /*  Licenses and Notices							*/
 /*										*/
@@ -190,7 +190,7 @@ typedef void(*TpmCryptSetSymKeyCall_t)(
 
 /* Forward reference */
 
-typedef union tpmCryptKeySchedule_t tpmCryptKeySchedule_t;
+// kgold typedef union tpmCryptKeySchedule_t tpmCryptKeySchedule_t;
 
 /* This definition would change if there were something to report */
 #define SymLibSimulationEnd()