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 1E9E1D8024B for ; Thu, 3 Aug 2023 04:39:27 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=UgtzYOFTVH+5JvUCMkqktd4PiOu1kfN8knqwCySxX1s=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1691037566; v=1; b=X+ZkP9bVpPQiT+0NoQaGvECaNAWB+Z0tfBf6AStNn4CxphlCwaGodQLf6Stm0KxYEAUHP8Wt fVZVxzr202ilfOknJdOoyyS93AYQttQJMAaaNUGrM/v2kLJCqZAXVEJJjiOAG7My21Xhzs2GsNC uBGvvwps0LrYMHTffkt89f6E= X-Received: by 127.0.0.2 with SMTP id 3hkTYY7687511xQU29iHdNxg; Wed, 02 Aug 2023 21:39:26 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.7313.1691037564440257345 for ; Wed, 02 Aug 2023 21:39:26 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="456141253" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="456141253" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 21:39:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="794848122" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="794848122" X-Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.10]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 21:39:18 -0700 From: "Li, Yi" To: devel@edk2.groups.io Cc: Yi Li , Jiewen Yao , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH V2 27/29] CryptoPkg: remove strcmp to syscall Date: Thu, 3 Aug 2023 12:37:45 +0800 Message-Id: <328b3e3cc2bb027d3400e025c6df9832643c3adf.1691031203.git.yi1.li@intel.com> In-Reply-To: References: MIME-Version: 1.0 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: tuztitnR1R1pOQSZZFN16ouGx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=X+ZkP9bV; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) In rare cases the platform may not provide the full IntrinsicLib. But openssl30 build always require strcmp, provide this function by moving it into CrtWrapper.c. Signed-off-by: Yi Li Cc: Jiewen Yao Cc: Xiaoyu Lu Cc: Guomin Jiang --- CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c | 9 +++++++++ CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c index 6d7ac3efdc..37cdecc9bd 100644 --- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c @@ -275,6 +275,15 @@ strcpy ( return strDest; } +int +strcmp ( + const char *s1, + const char *s2 + ) +{ + return (int)AsciiStrCmp (s1, s2); +} + // // -- Character Classification Routines -- // diff --git a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c index 611e9fd773..9b091f1901 100644 --- a/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c +++ b/CryptoPkg/Library/IntrinsicLib/MemoryIntrinsics.c @@ -63,12 +63,3 @@ memcmp ( { return (int)CompareMem (buf1, buf2, count); } - -int -strcmp ( - const char *s1, - const char *s2 - ) -{ - return (int)AsciiStrCmp (s1, s2); -} -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107508): https://edk2.groups.io/g/devel/message/107508 Mute This Topic: https://groups.io/mt/100520612/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-