diff options
| author | Li, Zhihao <zhihao.li@intel.com> | 2022-03-25 15:40:46 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2022-03-26 10:40:04 +0000 |
| commit | 355515a06a609327794070a91efe26a45a2e3325 (patch) | |
| tree | cf65414414c075654d37488381c63d3b26d80781 /CryptoPkg | |
| parent | 4a2e1000a19057c7a789b093c2fd943f966e4bdd (diff) | |
| download | edk2-355515a06a609327794070a91efe26a45a2e3325.tar.gz edk2-355515a06a609327794070a91efe26a45a2e3325.tar.bz2 edk2-355515a06a609327794070a91efe26a45a2e3325.zip | |
CryptoPkg? Redefinition bug in CrtLibSupport.h.
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3885
Parallel hash patch redefines uint_64 type in CrtLibSupport.h
which has been defined in openssl/include/openssl/e_os2.h.
CryptMd5.c including e_os2.h cause redefinition bug.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Signed-off-by: Zhihao Li <zhihao.li@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Diffstat (limited to 'CryptoPkg')
| -rw-r--r-- | CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h | 2 | ||||
| -rw-r--r-- | CryptoPkg/Library/Include/CrtLibSupport.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h b/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h index fe08d4928e..dcfe200e58 100644 --- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h +++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h @@ -25,6 +25,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ #define KECCAK1600_WIDTH 1600
+typedef UINT64 uint64_t;
+
//
// This struct referring to m_sha3.c from opessl and modified its type name.
//
diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h index b76b140a7a..75172b920b 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -111,7 +111,6 @@ typedef UINT8 u_char; typedef UINT32 uid_t;
typedef UINT32 gid_t;
typedef CHAR16 wchar_t;
-typedef UINT64 uint64_t;
//
// File operations are not required for EFI building,
|