tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 15:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdePkg/Include/IndustryStandard: Add operator_ and xor_ field names

Browse Source 
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 temporarily introduces an anonymous union to add
operator_ and xor_ fields to support migration from the current
field names to the new field names.

Warning 4201 is disabled for VS20xx tool chains is a temporary
change to allow the use of anonymous unions.

Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Michael D Kinney 2023-05-27 18:02:16 -07:00 committed by mergify[bot]
parent 1e079360cd
commit 05ac9a58f5
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,14 @@
#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
/// ///
@ -744,8 +752,11 @@ typedef struct tdTPM_PERMANENT_FLAGS {
BOOLEAN TPMpost; BOOLEAN TPMpost;
BOOLEAN TPMpostLock; BOOLEAN TPMpostLock;
BOOLEAN FIPS; BOOLEAN FIPS;
BOOLEAN operator; union {
BOOLEAN enableRevokeEK; BOOLEAN operator;
BOOLEAN operator_;
};
BOOLEAN enableRevokeEK;
BOOLEAN nvLocked; BOOLEAN nvLocked;
BOOLEAN readSRKPub; BOOLEAN readSRKPub;
BOOLEAN tpmEstablished; BOOLEAN tpmEstablished;
@ -2162,4 +2173,11 @@ 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,6 +15,14 @@ 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
@ -1248,7 +1256,10 @@ 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;
TPMI_ALG_HASH xor; union {
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
@ -1321,7 +1332,10 @@ 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;
TPMS_SCHEME_XOR xor; union {
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
@ -1810,4 +1824,11 @@ 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