From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 1D332AC0D66 for ; Thu, 4 Jan 2024 08:56:59 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=RvUMf8efIh+0+XdudOAgecf8wsaKZPLrFXg7pfeD+CA=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1704358618; v=1; b=wEHfMi51tiDy/5VEoC2iipQceL57XPJizfIcU3mXvXw9Kkr1rdfEDgekL2n9Wssw67REQM68 iyR+AwMSxcJGSdEqCEaGPJ3Uqt1IHVFOszqGb68hPMobDShfwuDszRfIhDGYx4D0Zltkm/F6Ejv 6a1ZcgQX04bFYU2FFuq1yeYo= X-Received: by 127.0.0.2 with SMTP id lyHOYY7687511x2Ij7z4owQi; Thu, 04 Jan 2024 00:56:58 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by mx.groups.io with SMTP id smtpd.web10.50189.1704358618067390690 for ; Thu, 04 Jan 2024 00:56:58 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="3982176" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="3982176" X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2024 00:55:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="923838743" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="923838743" X-Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga001.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 04 Jan 2024 00:55:18 -0800 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 4 Jan 2024 00:55:17 -0800 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 4 Jan 2024 00:55:11 -0800 X-Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Thu, 4 Jan 2024 00:55:11 -0800 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.168) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Thu, 4 Jan 2024 00:55:10 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JyEPM81o1UYSrQ/yCW1sLkm5BE39cfzcAwfIOos5VFRu1A+jLqNSGccKP3YFPuDjAzZNfYcGiKxNJ3OW7WjoZDZS203YGAAr4+mg4lsiRaq4pe34cW7a6MbPkZ1/np+Hf861YJp3SbTAOZ5eT3vdGP++i+4uo2HzQGmoyXAbxNDpr+hfMkLh9LbzG8VAjcXZxflF+qjpF1cUMFWgICV2G2BOgFF6/d/oT/WtDui70tYqArwiUBTETB5hQwBdsnPBk4tRJqSAuTBf/3rHykGORVSWIA2YjLCFi7ryHx9ruq+00GV2Br86WdIGVhCFlBWdowAR846M6ct3JYMMScH1tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=h9ZA5mcV3F7Qokpe/jEwP0miY3v2RgI/AaoWXvO+6Ww=; b=G6NxrKR2f3qTwXgQ9bpPZ9YFnkhBI511raZ9aDjzFqfyD+0vugwtuMfNpeVBcqOzRe16+37DkBNcQPgaJnSC/rChryhpRg+dwdUrQwPCjruYEvFwsqwiZU8RX3UBS9APEq0iZxMmd3QokMnfClP3IgA3XUW8VcuJ8IgDxMchslQvrOf0u36+RhU/TDiNufLiXt3oCuPMeNGhCdQdpQjOFvQamKchGquQx1agmlib1OPmY1sraS/gHGwgYfUWlYxR7f6Me5tBP2F7Jiv/TA14TYHzAqQdlLh0e0cB+DyvzQryMyhF9PERJ3m5oBUdNYp7I0gHu2DSR0jG1BCRDDtoBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from SJ1PR11MB6227.namprd11.prod.outlook.com (2603:10b6:a03:45a::10) by LV3PR11MB8604.namprd11.prod.outlook.com (2603:10b6:408:1ae::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.13; Thu, 4 Jan 2024 08:55:08 +0000 X-Received: from SJ1PR11MB6227.namprd11.prod.outlook.com ([fe80::bee8:181:ff56:8bd]) by SJ1PR11MB6227.namprd11.prod.outlook.com ([fe80::bee8:181:ff56:8bd%6]) with mapi id 15.20.7135.023; Thu, 4 Jan 2024 08:55:08 +0000 From: "Li, Yi" To: "Hou, Wenxing" , "devel@edk2.groups.io" CC: "Yao, Jiewen" , "Jiang, Guomin" Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg: move define to CrtLibSupport Thread-Topic: [PATCH 1/1] CryptoPkg: move define to CrtLibSupport Thread-Index: AQHaPubYgbutHhKYmEuaFgS/nHjU+7DJWXnQ Date: Thu, 4 Jan 2024 08:55:08 +0000 Message-ID: References: <20240104081955.2848-1-wenxing.hou@intel.com> <20240104081955.2848-2-wenxing.hou@intel.com> In-Reply-To: <20240104081955.2848-2-wenxing.hou@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SJ1PR11MB6227:EE_|LV3PR11MB8604:EE_ x-ms-office365-filtering-correlation-id: 1036ffbb-ff99-400a-6247-08dc0d02da43 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: 4dVAFwoExXyeOTNtM3HUp6pTC89ViQq5uaHan9mtiCMs+2QeFZvT/ORknWaoEsSMizcwawNyD5m5Bf1leAF33Ku1/rfIF369zQOiTAMXFEL5Hneohw68Mp775mqPYM972Ku2uceKK6s0ofvpzgbFQeZi/M3juErGrmV3YE9ojn6JF1b8gMaVnNevSXZ8sXX9IKC3wnJpXEvPCF1qKoZXjhJb82ChxY9gskcbKrdbr7aIfIEqSGqMoGAa/CSZFSSiynOBux5tHBhZ3nDFza7TnqF0J8NUGU9NPHEbMxzbcwrFRcBRKDnYsHMMWFEevWLSwjeR7Dqpi3CcLi+YZkTAbrmSw5epPX6kt4FzsFk+a6QMDugmXM1O3rEcrWR2P0cl+uDD7FnTpMboWtEPskGXgI6KyRENW2nSZ6ILCczQk/lre5IDHc0UYbURRPVo2gb2zhTgwoCDm6GYf2i8gVficCSbejJRR1ZoDfndQ6LS3v/6xcZ/MF+/l+hywiJCp4tJh57u1eV2ZUlw6yhBbwCEHS8NRsRqqo+20mj9rfVOWHC0Qe0qtfH+aAQLi7SUS/z7WqJr2uO+sbyZIv1msmi5KMFIXxesiY3HI6O2wQbLH1U= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?WUqx4RWFFaSp0ULPnqI4T3wnAMofKO3yCrkzyXo6jlrKjgvfdFyk0CYRUeim?= =?us-ascii?Q?+ZGHAjP7qgdrlA4WYfSaJdlmmM0r2WDoZpUQ9h4G6fU1EGJvHnbkKsJ2BXxG?= =?us-ascii?Q?0JhXZ8Y3QtmvragvKNR6iowLuNhM5fwB9NJbwuNhodJ5AYlPG/rS+5aIXz7H?= =?us-ascii?Q?Pzha8a+kmWnhyzDX1lfvgJPlRdI24kqH1olgD9csJa8lExdFairw7CiNL3Eg?= =?us-ascii?Q?VHBTtmFJF8EuiJJFXY4T0yyNFNKWmQo/pynzAO1e/miMGYWrUheZZAc5SOQa?= =?us-ascii?Q?PuDaMaMS/hIQZvXJiiJ4RmO7Gx9f5KNV1uRRaKvDvMlfD7eOXD6w3/S0L/AN?= =?us-ascii?Q?772BeCjZ9d/8sbMRrpK7yOO+mYgvnw5Js1D3HIp+jjEA+Rn/O62+mobvOn9c?= =?us-ascii?Q?1Grkg8QwLkejyTj81p+A6/6UQbjxc68KXtC9G8q0+edtg2SBfGmnc0Ur+gKc?= =?us-ascii?Q?gFmHB/y+bbrtctiEfCMAlEJB8SmwUrIpoPf1VKlXtS5ocR3MJiVXsLIoB+TB?= =?us-ascii?Q?ugg8K7hqYlp7B+PnicEDQTE8pVQbzzaEiZCwX69EMON3GQDF9fTD+ZCcuOpp?= =?us-ascii?Q?00fJsjObMTL9OQ+hZ4Ua/02jbB3mrHKdz/wMj7NuPukxn+CTYtu3LBvdDboW?= =?us-ascii?Q?zUdAgibsTCgGy7GMnWuEDUa2mJeZEopMHGk6fENcVAmfhPZuNM0XxbbQcmbC?= =?us-ascii?Q?LEksMKF7l+sPbUoPqb0BlVMpLRsZDLGuzBJXgoJL6tY9JouSBXFdddSxHwv7?= =?us-ascii?Q?2VCqRJ0PuZYQE89RHXj+SEXGescARXYyfMt7BFuyeteX2dBtSGJMfgfkUT4n?= =?us-ascii?Q?KL6hwMUFwzQQzFd4/T5oJDcZJfcBpao59gfPAW2vwxh5prBKdLAfZFHGalTn?= =?us-ascii?Q?W1jqgRLdn0exXxrW/6gI1UbtqBAKoKo65tjcDG93qyiuvT21AAkYsp8DUm8H?= =?us-ascii?Q?gof2rYGyWqcrytcHKmN01LX83krOrnqeH/tcKTwiKBqHlSMC1wBmCjHnzjKY?= =?us-ascii?Q?ebks15nwlms6cEJaTlStPrra4S+J0quBOYotFf49AsgWRHztXQy4JpC+OO6e?= =?us-ascii?Q?gBT19Krp2sTOOTGVEQpeDQAdNJovRCGaXP712IDz43NddiyUH8LddlBQy+St?= =?us-ascii?Q?ssQ+b+wSQwxgPy2Muiq4FgBp0ZENxWRCJC5BLjie6xU3sgTUkKaYFV6NunhO?= =?us-ascii?Q?7PiE5S6YhADMCawPknANtM+fvih69VurdL1lmGvPvLjfHoGy75rw4m1IPzqm?= =?us-ascii?Q?H3WLPsxDAcNQPObTsGlNJi8vButvwztmnWc1Ro8uPUSh5LF3X1uiRg0laheo?= =?us-ascii?Q?pKL0nRI3K5y27wPYdXgtTdVMNlrL9tLflaIlMboKiui2zciuRXbSEWiG6X7U?= =?us-ascii?Q?1mINxMvosGm/ZtI2VK5U4ASsMNWeS7xQ43gaNfCIMuwzHmtQ1x3OOe8k7YgP?= =?us-ascii?Q?X2M8fNL8dmYJnbMcWkeARrYRix5eAQduEWgM9wGBjW0Me9fjjejpfmW0nfI7?= =?us-ascii?Q?PikgOrqtaOxnCvTJcG5nr26qvplf+/wHPwtjxZFdOcK0RYBeTTaJcS6GKSbn?= =?us-ascii?Q?ihkJVER4EOUTkyW734Y=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6227.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1036ffbb-ff99-400a-6247-08dc0d02da43 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Jan 2024 08:55:08.2211 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 7vhA8y4GxQcKj1AQGzPW8wD21HebGoA+2E67sslsb1PPjNUqh65zXbNk+X13iMb4rwZqHee+Oa6BRM7uIC0Fmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR11MB8604 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,yi1.li@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: mvw0iUPGKXBCb0HJoxmuYP66x7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=wEHfMi51; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Looks good to me. Reviewed-by: Yi Li -----Original Message----- From: Hou, Wenxing =20 Sent: Thursday, January 4, 2024 4:20 PM To: devel@edk2.groups.io Cc: Yao, Jiewen ; Li, Yi1 ; Jiang, = Guomin Subject: [PATCH 1/1] CryptoPkg: move define to CrtLibSupport REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4632 The before code will cause redefine error. This patch move them to CrtLibSupport header. But Openssl has already defined them internally, need to increase support f= or OPENSLL_SYS_UEFI judgment. Cc: Jiewen Yao Cc: Yi Li Cc: Guomin Jiang Signed-off-by: Wenxing Hou --- CryptoPkg/Library/Include/CrtLibSupport.h | 15 +++++++++++++++ CryptoPkg/Library/Include/stdint.h | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/= Include/CrtLibSupport.h index f36fe08f0c61..76591f12cb67 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -424,4 +424,19 @@ strcpy ( #define atoi(nptr) AsciiStrDecimalToUintn(nptr) #define getti= meofday(tvp, tz) do { (tvp)->tv_sec =3D time(NULL); (tvp)->tv_usec =3D 0;= } while (0) +//+// only use in Mbedlts. The Openssl has defined them inter= nally.+//+#ifndef OPENSSL_SYS_UEFI+typedef INT8 int8_t;+typedef UINT8 ui= nt8_t;+typedef INT16 int16_t;+typedef UINT16 uint16_t;+typedef INT32 int3= 2_t;+typedef UINT32 uint32_t;+typedef INT64 int64_t;+typedef UINT64 uint64= _t;+typedef UINTN uintptr_t;+#endif+ #endifdiff --git a/CryptoPkg/Library/= Include/stdint.h b/CryptoPkg/Library/Include/stdint.h index 17b8c767d7be..786d57e8d53d 100644 --- a/CryptoPkg/Library/Include/stdint.h +++ b/CryptoPkg/Library/Include/stdint.h @@ -7,13 +7,3 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ #include --typedef INT8 int8_t;-typedef UINT8 u= int8_t;-typedef INT16 int16_t;-typedef UINT16 uint16_t;-typedef INT32 = int32_t;-typedef UINT32 uint32_t;-typedef INT64 int64_t;-typedef UINT64 = uint64_t;-typedef UINTN uintptr_t;--=20 2.26.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113152): https://edk2.groups.io/g/devel/message/113152 Mute This Topic: https://groups.io/mt/103519077/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-