[PATCH v1 1/1] CryptoPkg： Redefinition bug in CrtLibSupport.h.

[PATCH v1 1/1] CryptoPkg： Redefinition bug in CrtLibSupport.h.

[Li, Zhihao]

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

Re: [edk2-devel] [PATCH v1 1/1] CryptoPkg： Redefinition bug in CrtLibSupport.h.

[Yao, Jiewen]

Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Li, Zhihao
> Sent: Friday, March 25, 2022 3:41 PM
> To: devel@edk2.groups.io
> Subject: [edk2-devel] [PATCH v1 1/1] 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>
> ---
>  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
> 
> 
> 
> 
> 

Re: [edk2-devel] [PATCH v1 1/1] CryptoPkg： Redefinition bug in CrtLibSupport.h.

[Yao, Jiewen]

Merged: https://github.com/tianocore/edk2/pull/2692

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yao, Jiewen
> Sent: Saturday, March 26, 2022 2:50 PM
> To: devel@edk2.groups.io; Li, Zhihao <zhihao.li@intel.com>
> Subject: Re: [edk2-devel] [PATCH v1 1/1] CryptoPkg： Redefinition bug in
> CrtLibSupport.h.
> 
> Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Li, Zhihao
> > Sent: Friday, March 25, 2022 3:41 PM
> > To: devel@edk2.groups.io
> > Subject: [edk2-devel] [PATCH v1 1/1] 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>
> > ---
> >  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
> >
> >
> >
> >
> >
> 
> 
> 
> 
>