tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdePkg/Include/IndustryStandard: Address C++ keyword collisions 

Update Tpm12.h and Tpm20.h and not use c++ reserved keywords
operator and xor in C structures to support use of these
include files when building with a C++ compiler.

This patch removes the temporary use of anonymous unions and
warning 4201 disable for VS20xx tool chains to complete the
following field name changes:

* operator -> operator_
* xor -> xor_

NOTE: This is a non-backwards compatible change to Tpm12.h
and Tmp20.h. And consumers of these include files that access
the "operator" or "xor" fields must be updated.

Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Michael D Kinney 2023-05-30 10:11:24 -07:00 committed by mergify[bot]
parent e6a886fdfc
commit da1084ccf4
2 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MdePkg/Include/IndustryStandard/Tpm12.h
View File

@ -9,14 +9,6 @@
#ifndef _TPM12_H_ #ifndef _TPM12_H_
#define _TPM12_H_ #define _TPM12_H_
///
/// Temporary disable 4201 to support anonymous unions
///
#if defined (_MSC_EXTENSIONS)
#pragma warning( push )
#pragma warning ( disable : 4201 )
#endif
/// ///
/// The start of TPM return codes /// The start of TPM return codes
/// ///
@ -752,10 +744,7 @@ typedef struct tdTPM_PERMANENT_FLAGS {
BOOLEAN TPMpost; BOOLEAN TPMpost;
BOOLEAN TPMpostLock; BOOLEAN TPMpostLock;
BOOLEAN FIPS; BOOLEAN FIPS;
union { BOOLEAN operator_;
BOOLEAN operator;
BOOLEAN operator_;
};
BOOLEAN enableRevokeEK; BOOLEAN enableRevokeEK;
BOOLEAN nvLocked; BOOLEAN nvLocked;
BOOLEAN readSRKPub; BOOLEAN readSRKPub;
@ -2173,11 +2162,4 @@ typedef struct tdTPM_RSP_COMMAND_HDR {
#pragma pack () #pragma pack ()
///
/// Temporary disable 4201 to support anonymous unions
///
#if defined (_MSC_EXTENSIONS)
#pragma warning( pop )
#endif
#endif #endif

25
MdePkg/Include/IndustryStandard/Tpm20.h
View File

@ -15,14 +15,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <IndustryStandard/Tpm12.h> #include <IndustryStandard/Tpm12.h>
///
/// Temporary disable 4201 to support anonymous unions
///
#if defined (_MSC_EXTENSIONS)
#pragma warning( push )
#pragma warning ( disable : 4201 )
#endif
#pragma pack (1) #pragma pack (1)
// Annex A Algorithm Constants // Annex A Algorithm Constants
@ -1256,10 +1248,7 @@ typedef union {
TPMI_AES_KEY_BITS aes; TPMI_AES_KEY_BITS aes;
TPMI_SM4_KEY_BITS SM4; TPMI_SM4_KEY_BITS SM4;
TPM_KEY_BITS sym; TPM_KEY_BITS sym;
union { TPMI_ALG_HASH xor_;
TPMI_ALG_HASH xor;
TPMI_ALG_HASH xor_;
};
} TPMU_SYM_KEY_BITS; } TPMU_SYM_KEY_BITS;
// Table 123 - TPMU_SYM_MODE Union // Table 123 - TPMU_SYM_MODE Union
@ -1332,10 +1321,7 @@ typedef struct {
// Table 136 - TPMU_SCHEME_KEYEDHASH Union // Table 136 - TPMU_SCHEME_KEYEDHASH Union
typedef union { typedef union {
TPMS_SCHEME_HMAC hmac; TPMS_SCHEME_HMAC hmac;
union { TPMS_SCHEME_XOR xor_;
TPMS_SCHEME_XOR xor;
TPMS_SCHEME_XOR xor_;
};
} TPMU_SCHEME_KEYEDHASH; } TPMU_SCHEME_KEYEDHASH;
// Table 137 - TPMT_KEYEDHASH_SCHEME Structure // Table 137 - TPMT_KEYEDHASH_SCHEME Structure
@ -1824,11 +1810,4 @@ typedef struct {
#define HASH_ALG_SHA512 0x00000008 #define HASH_ALG_SHA512 0x00000008
#define HASH_ALG_SM3_256 0x00000010 #define HASH_ALG_SM3_256 0x00000010
///
/// Temporary disable 4201 to support anonymous unions
///
#if defined (_MSC_EXTENSIONS)
#pragma warning( pop )
#endif
#endif #endif