From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web09.2572.1648194048889851194 for ; Fri, 25 Mar 2022 00:40:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=I9CKBGNa; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: zhihao.li@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648194048; x=1679730048; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=xNWEHbVUdyD+oo0ZdiSjMSNll+SMHz31Z66Qvk3n0m0=; b=I9CKBGNa0FBEsmY6gHY1SkzYQd7BXB8RxtvX/4j+vcxi6DSfCNBYfW8U CPhzQRadXupDb4TAA2ZLUR6X4qfoiY23UVBqWw1XYm7DRvaM5oqZO8cu/ HQdu4wXP/TQRbk1TSPEZd3ntBmQl10R89XY548kBFoFNE7SBhJsQ3+R8/ mTnABPJudYe0ukHczt7o0UKMYZPpwla+Ae7Jy6v77qXO7gWhHpxoQTj6X 0oXth8BPEUCSOCJEHhl+vPYwUai7ksf/68UgCmCdKxyXBP9NZOn1qaRjG rt3/gH/H5VWVykR/njv1Si828K92S0SfKlcQzMoMJTIXuF+uLaNgt18rS w==; X-IronPort-AV: E=McAfee;i="6200,9189,10296"; a="258771168" X-IronPort-AV: E=Sophos;i="5.90,209,1643702400"; d="scan'208";a="258771168" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2022 00:40:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,209,1643702400"; d="scan'208";a="544981363" Received: from win_li.ccr.corp.intel.com ([10.239.157.34]) by orsmga007.jf.intel.com with ESMTP; 25 Mar 2022 00:40:47 -0700 From: "Li, Zhihao" To: devel@edk2.groups.io Subject: =?UTF-8?B?W1BBVENIIHYxIDEvMV0gQ3J5cHRvUGtn77yaIFJlZGVmaW5pdGlvbiBidWcgaW4gQ3J0TGliU3VwcG9ydC5oLg==?= Date: Fri, 25 Mar 2022 15:40:46 +0800 Message-Id: <20220325074046.671-1-zhihao.li@intel.com> X-Mailer: git-send-email 2.26.2.windows.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3885 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 --- 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/Cryp= toPkg/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/ =0D #define KECCAK1600_WIDTH 1600=0D =0D +typedef UINT64 uint64_t;=0D +=0D //=0D // This struct referring to m_sha3.c from opessl and modified its type nam= e.=0D //=0D 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;=0D typedef UINT32 gid_t;=0D typedef CHAR16 wchar_t;=0D -typedef UINT64 uint64_t;=0D =0D //=0D // File operations are not required for EFI building,=0D --=20 2.26.2.windows.1