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 E388C74004A for ; Wed, 10 Jan 2024 11:25:34 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=bld8/Xvm9idPitV0/aKdBqocwaA6Q2L4RxWlnbL8sYk=; 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=1704885933; v=1; b=CpEz5jLOxPUg3D3qzXBuCiR5qQuUJN8+pFb7SQ95l+b3Ntzyk2MWmkmfv8RBSV4EFrLn3ERN SksXLWue76Fz5fckoDNz2WawtfwY6pXhS6WJD+LDf6I9Ygi1khDFuHzOHH5VqOJPLRkQOwkRNcL OyKDe03OAmqGaHxbrZQrDC2I= X-Received: by 127.0.0.2 with SMTP id i6XWYY7687511xzQTUdG3y6q; Wed, 10 Jan 2024 03:25:33 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by mx.groups.io with SMTP id smtpd.web11.9554.1704885932486926729 for ; Wed, 10 Jan 2024 03:25:32 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10947"; a="5232637" X-IronPort-AV: E=Sophos;i="6.04,184,1695711600"; d="scan'208";a="5232637" X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2024 03:25:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10947"; a="872608768" X-IronPort-AV: E=Sophos;i="6.04,184,1695711600"; d="scan'208";a="872608768" X-Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by FMSMGA003.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 10 Jan 2024 03:25:30 -0800 X-Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Jan 2024 03:25:29 -0800 X-Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 10 Jan 2024 03:25:29 -0800 X-Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Wed, 10 Jan 2024 03:25:29 -0800 X-Received: from NAM04-MW2-obe.outbound.protection.outlook.com (104.47.73.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; Wed, 10 Jan 2024 03:25:29 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hjeJ6qf9jxmKXZwFqgeBvhEHK6Au3dLK4fAcleMO9zHT7oihb9sOoQqRhTTJCHBjRQ7qARlpkJQ4ebj8+RSYc7MvsZn1foaJlJDvbYiTxKME5CTM23MYLSfsyMZZBSQEWg8HYuTXZ98tpytTqF1BSlMWC+Ew60sImTwisn3bOmDzyIvXBAQc3ZZRR+jWpb2ILU6E9tA8UXLBQQt/H4EICffHrOZGVFdw0qsvOypPnT7A1tQVZrYLkZRTOdXvpD1f4zP4tc+32AXK8bd1f++4bzbWw6SfUHRIioOPx0BmCCHMps8whwDqYnPUa4ZFZ8GC6XFNlKtIoaXQJRLXXZxv6A== 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=MNwZsx8oX1/dC7u20A2ZatiLwdcmeMjGXgEVWjtMs3Q=; b=K6Nd9alg2X1t6MiJ+wnNxcq5Pm26gsroy3z6675WU5mR+DGpHN05xw/ZjP8GyhEXdLuQu4QClGDIOEP9UztOGhx5E56jkeku3JpENGF3xo7MmDMVJkYUQcrtNcBwZClwkJVo309MWmuoYsz0HT2OsMV+zvGmdFkY9ueazncBu2T3oAbNg/8aKDcM6wRo1tCXSDpc/vVdpLhV4H5gF16F/j3gb3RphN3yDJD2UeSMQ78XgYslpI25r3CMhHGanit3MhKf7vB1sfLn4GIyXC0VLS9tDdZetCQjAonl/rki1Tzudu118UOrbrwv5G4YTjq8oaoKY+E0NwA9nXdOD9F/RQ== 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 PH7PR11MB7003.namprd11.prod.outlook.com (2603:10b6:510:20a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.18; Wed, 10 Jan 2024 11:25:22 +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.7159.018; Wed, 10 Jan 2024 11:25:21 +0000 From: "Li, Yi" To: "Hou, Wenxing" , "devel@edk2.groups.io" CC: "Yao, Jiewen" , "Jiang, Guomin" Subject: Re: [edk2-devel] [PATCH] CryptoPkg: change the define Thread-Topic: [PATCH] CryptoPkg: change the define Thread-Index: AQHaQ7ZmkWJuBWUFbUuPvys5ugq2abDS5csg Date: Wed, 10 Jan 2024 11:25:21 +0000 Message-ID: References: <20240110111551.3706-1-wenxing.hou@intel.com> In-Reply-To: <20240110111551.3706-1-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_|PH7PR11MB7003:EE_ x-ms-office365-filtering-correlation-id: 9c763484-e075-4050-6170-08dc11ced54c x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: dPdMAo+IRinVnygwq7ugdlGuYj8wIFayUA9Yaqysp0nWLT1+dze+dtO/jhMfs+Ga2zNcbJ0FTV52CP4LRU75EVqmgDRnn7QnODt9H9DmSJgNIeQwDo9wUYbcKzVSTzG95CPCKByooKqwdiNHPm8BQ+7dZzhn9P0Ne9S4JyE+kxQRWRCXNfMCsUPF/xM62QlbLF+FcOtDKZZrTkwyEl6IzCRLcdVnAUPtWrFVUH6+vnwsK5yMKcMAdx6nYTK2pEcDqRuA6L9ajEn54KKikfZLsg06X2HorygK6go5M6XOLB0ecxTowlm6SDxayjWaO49HMLomb+oHuvZnFio9LlojxUnIE/snXYwJ1UfgO+lJkGFAGf2BOwrn3E1iLy+bh6cf2J3yfMyfGV8sfbEs2EcEbwZ42+vxf9DTOrMPf7cEKi3l1wvDfamHwjiO0OxkmDPTefTXl5ekmD9tojcOVq0m0HGLej5I5eS1tcWQsOUPS+uFH+yZ27SGn61AnymB2blMGsGcVuXHxz8YXRSYeHg+++YPVTV1+fGNFBxneTDC3ZuCO9H31FqmnoWWxIfvuMm3Bmfi6Hb2HxrHv+pdxSnh1Xn8aP6NclVlof0Q+xAkWMU= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?USyRjzRiUCaeCTId4wQ21AK0BiOraUi/HDeGM2oAvueuiGPVud75TyE87zJT?= =?us-ascii?Q?E1AWuHXpeF3qs5klYsAKhVXeZdDKUrfQqhd4Bp9S4YF/p+nyOW8wJg/wUHdQ?= =?us-ascii?Q?3Viv+4HoDGYhw0bGHRFu6VFwlABZ/98zynygEbektEU7Xt75Sx3kt3LCj7qM?= =?us-ascii?Q?WRQp+dfIZYFV6GLvQEce/M+0pa4eijXbFYT7LjQ1KUyHSPbCWlVC/ChNt68j?= =?us-ascii?Q?PjAmb0oxbeaWLUzgupwmS60Mw8NIKzxxJdXA7XeebekoY9JkmtiA5RTToQHx?= =?us-ascii?Q?l6eg36PTaskse0CYC7WYWXYA5y6acAf3aaUitDukcaapseY/ItCJmiQ2iWqS?= =?us-ascii?Q?tQSUWKcMBHrK7yFNnNOWNH0VHEd4wFrrO15077MkQxKAiEMZYUFrChIZTuQd?= =?us-ascii?Q?Fz/ASj2QHxQYlyl8akjFzc/cYw3M7a6cpsUakNiLuz0Y9XQpgOLhRqJGra35?= =?us-ascii?Q?ddtlxqMX6IoYumyu9024EaErKkH1J/ra3vDmY5p4sSNk6DA2mZWmH1oNBf42?= =?us-ascii?Q?oXtOp2GvQiDsl2KVneCvsNXG5BSoJsLmiul8Hp7B5zTmfFjfFVGklW0RFJIq?= =?us-ascii?Q?HZHHMtE7Kl7p4kk8URFi7UyLQjLpMTnfR7puYNeMsOVL2gzABE97VhQ/QhjK?= =?us-ascii?Q?c8MSJiQtOGQFZyzEVvfu0jKfoJwxzwsnfSz8QbCW014Fv+XamSN67cMYanK7?= =?us-ascii?Q?F4xNJkl3+UUxyavz4Iw7GOASRjpH9TGDSvjnzWYrHp086DxEC6ZvCVzt5SZP?= =?us-ascii?Q?7JoXxcvSH6mIm838H8vuYrRoceQik7DcR1+UcdYWGru4L1KZuzOGzSQNhi47?= =?us-ascii?Q?rNJQePD+SQBYqJD/WGOOgF3f3yFW43ZYbjfroLxfOS7OanldVf/I07lkaub7?= =?us-ascii?Q?fKJ1dd/efr/QpfcUGNlW3Q0X8L8aRVgLmtx8U2fBtS11BSZsJtB4CYx96Q3E?= =?us-ascii?Q?FbTMYY9S+kQStK2md2NFBalQMJmewtRkgk8EhKtGKsSYWhVt8D/pj6/FIj6c?= =?us-ascii?Q?Yllk/GRFmwk8k42Pkp937+/kQZr5gv4PKtmQwJcdlnvHGhaiUxqFBn3cjCjX?= =?us-ascii?Q?QbxxZ0pW+OiHLU4zSTffesQCHuNnm894BgjK5Z4ei22ptmRtp4yjAgtfT7lx?= =?us-ascii?Q?k6X8wiPIw0iTTfqSO8HfYmtUkTDOjzOleKgzxbEoLcAKkdTl2zJ+hQ7XO3Xk?= =?us-ascii?Q?tseNVGRCTesZpwM3E5yzXymvu+mAbTqN7dEZxY0H38swPmUpVGo6eafwmk3p?= =?us-ascii?Q?lt/KT/13wKmubzqjZy9yy8K/IOzv0UnFaUh8aljgQexPCz062wgvTGlqScJH?= =?us-ascii?Q?l3T9GU8+DrQ/Jt3Hg/DQ05TlIH82gND+vZuir/V781TtBrnTVBz0t0SfbeCn?= =?us-ascii?Q?hoVmpOOYOv65TGXwyTyhsVFUaeo9o8MozIhlN3V9vq0LPxkW6aHcmyTEyc0e?= =?us-ascii?Q?MSJQI2YTBlmHFvdd+X+gog5tNS/MNr3cNct4C6FN9JxHuieXbDJoFhQiWmjA?= =?us-ascii?Q?xLXpzdQzLdxtSPef/55AlYctbkVQ/8Sy66S9ZPf7sxC1L7x2FIoYctBRaDCe?= =?us-ascii?Q?3Hu1SgWI+y4HfTW2Z0A=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: 9c763484-e075-4050-6170-08dc11ced54c X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jan 2024 11:25:21.8957 (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: qZSuyLDUgkADDiD8ay0cJwWhMPRljH8EyMrvqhBHwhx+tehXhmRD1iJrKIb/M4fWrQBi96dJf+fgAfRiJkTHeg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7003 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: XEUT1MmMGXwkfbTsRV4ZdQMdx7686176AA= 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=CpEz5jLO; 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; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Hi, this title is too simple. Please change it to CryptoPkg: Fix redefinition error of int defines -----Original Message----- From: Hou, Wenxing =20 Sent: Wednesday, January 10, 2024 7:16 PM To: devel@edk2.groups.io Cc: Yao, Jiewen ; Li, Yi1 ; Jiang, = Guomin Subject: [PATCH] CryptoPkg: change the define REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4632 Move the define to stdint and add MACRO to prevent duplicate inclusion. 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 | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/= Include/CrtLibSupport.h index 76591f12cb..f36fe08f0c 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -424,19 +424,4 @@ strcpy ( #define atoi(nptr) AsciiStrDecimalToUintn(nptr) #define gettimeofday(tvp, tz) do { (tvp)->tv_sec =3D time(NULL); (tvp)->= tv_usec =3D 0; } while (0) =20 -// -// only use in Mbedlts. The Openssl has defined them internally. -// -#ifndef OPENSSL_SYS_UEFI -typedef INT8 int8_t; -typedef UINT8 uint8_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; -#endif - #endif diff --git a/CryptoPkg/Library/Include/stdint.h b/CryptoPkg/Library/Include= /stdint.h index 786d57e8d5..e1f54b412e 100644 --- a/CryptoPkg/Library/Include/stdint.h +++ b/CryptoPkg/Library/Include/stdint.h @@ -6,4 +6,23 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ =20 +#ifndef CRYPTO_CRT_STDIO_H_ +#define CRYPTO_CRT_STDIO_H_ #include + +// +// only use in Mbedlts. The Openssl has defined them internally. +// +#ifndef OPENSSL_SYS_UEFI +typedef INT8 int8_t; +typedef UINT8 uint8_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; +#endif + +#endif --=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 (#113525): https://edk2.groups.io/g/devel/message/113525 Mute This Topic: https://groups.io/mt/103638765/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-