From: "Li, Zhihao" <zhihao.li@intel.com>
To: devel@edk2.groups.io
Subject: [PATCH v1 1/1] CryptoPkg: Redefinition bug in CrtLibSupport.h.
Date: Fri, 25 Mar 2022 15:40:46 +0800 [thread overview]
Message-ID: <20220325074046.671-1-zhihao.li@intel.com> (raw)
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>
---
CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h | 2 ++
CryptoPkg/Library/Include/CrtLibSupport.h | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h b/CryptoPkg/Library/BaseCryptLib/Hash/CryptParallelHash.h
index fe08d4928e8d..dcfe200e5829 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 b76b140a7acf..75172b920b67 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,
--
2.26.2.windows.1
next reply other threads:[~2022-03-25 7:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-25 7:40 Li, Zhihao [this message]
2022-03-26 6:50 ` [edk2-devel] [PATCH v1 1/1] CryptoPkg: Redefinition bug in CrtLibSupport.h Yao, Jiewen
[not found] ` <16DFDB91650F29A3.23644@groups.io>
2022-03-26 10:41 ` Yao, Jiewen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220325074046.671-1-zhihao.li@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox