From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.14911.1679043720870874677 for ; Fri, 17 Mar 2023 02:02:12 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=oAXh7iEM; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: wenxing.hou@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679043732; x=1710579732; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iJn7xAUeCNC7em5EiiWaSvr1d6x9kvbU+3B1NAJ62wI=; b=oAXh7iEMRjlolzLwcVRQozZSvgGinG3zdi9DXLbwWwTfuB1NPiU30enB r0dowVPueJSZbeKsPIA8dMzMfQ+qPeZ1dBHCkFt4wxFOxUd9TbhI8SlSx xGTVKRZeTnoC7N1FtAQSEJufmzAw4hSsty0Mr/Cmn+MP5yRlsnvs8zrOX z2TEPaNWp80CjBUcqEJ41o30DRO0m9m2UD2tQ0DC1cxMPSvFk2G1RDlt/ 8IV9NyeaBmr2XBZ+QJlxtk4zVas7wGOWRVM8HFPn4AaZ8p7KMU0AU8l/e tXUL1v33SLPwC5uGn9ueucmEIB2Ys+gGinKLjItJjtLZnNp1ECbcEknTN A==; X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="317871173" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="317871173" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 02:02:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="926066896" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="926066896" Received: from shwdejointd777.ccr.corp.intel.com ([10.239.157.39]) by fmsmga006.fm.intel.com with ESMTP; 17 Mar 2023 02:02:11 -0700 From: "Wenxing Hou" To: devel@edk2.groups.io Cc: Wenxing Hou Subject: [edk2-staging/OpenSSL11_EOL PATCH 7/7] Clean SysCall api by adding platform_util.c Date: Fri, 17 Mar 2023 17:00:53 +0800 Message-Id: <20230317090053.1895-8-wenxing.hou@intel.com> X-Mailer: git-send-email 2.26.2.windows.1 In-Reply-To: <20230317090053.1895-1-wenxing.hou@intel.com> References: <20230317090053.1895-1-wenxing.hou@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Signed-off-by: Wenxing Hou --- .../BaseCryptLibMbedTls/Rand/CryptRandTsc.c | 7 +++++++ .../SysCall/ConstantTimeClock.c | 14 -------------- .../BaseCryptLibMbedTls/SysCall/CrtWrapper.c | 5 ----- .../BaseCryptLibMbedTls/SysCall/TimerWrapper.c | 14 -------------- CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf | 1 + 5 files changed, 8 insertions(+), 33 deletions(-) diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/Rand/CryptRandTsc.c b/Cr= yptoPkg/Library/BaseCryptLibMbedTls/Rand/CryptRandTsc.c index 96d18eb7aa..a4ece17680 100644 --- a/CryptoPkg/Library/BaseCryptLibMbedTls/Rand/CryptRandTsc.c +++ b/CryptoPkg/Library/BaseCryptLibMbedTls/Rand/CryptRandTsc.c @@ -59,3 +59,10 @@ RandomBytes ( =0D return TRUE;=0D }=0D +=0D +int myrand( void *rng_state, unsigned char *output, size_t len )=0D +{=0D + RandomBytes (output, len);=0D +=0D + return 0;=0D +}=0D diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/ConstantTimeCloc= k.c b/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/ConstantTimeClock.c index 41a1fdd634..6c1d8a400d 100644 --- a/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/ConstantTimeClock.c +++ b/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/ConstantTimeClock.c @@ -59,17 +59,3 @@ struct tm * gmtime (const time_t *timer) time_t _time64 (time_t* t) {=0D return time (t);=0D }=0D -=0D -struct tm *mbedtls_platform_gmtime_r( const time_t *tt,=0D - struct tm *tm_buf )=0D -{=0D - struct tm * lt;=0D -=0D - lt =3D gmtime (tt);=0D -=0D - if (lt !=3D NULL) {=0D - CopyMem (tm_buf, lt, sizeof(struct tm));=0D - }=0D -=0D - return ((lt =3D=3D NULL) ? NULL : tm_buf);=0D -}=0D diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/CrtWrapper.c b/C= ryptoPkg/Library/BaseCryptLibMbedTls/SysCall/CrtWrapper.c index c401dae861..25074d3bfb 100644 --- a/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/CrtWrapper.c +++ b/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/CrtWrapper.c @@ -31,11 +31,6 @@ int mbedtls_vsnprintf(char *str, size_t size, const char= *format, ...) return 0;=0D }=0D =0D -void mbedtls_platform_zeroize( void *buf, unsigned int len )=0D -{=0D - ZeroMem (buf, len);=0D -}=0D -=0D int rand ()=0D {=0D // TBD=0D diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/TimerWrapper.c b= /CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/TimerWrapper.c index abb9a2226c..d940abb7f0 100644 --- a/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/TimerWrapper.c +++ b/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/TimerWrapper.c @@ -190,17 +190,3 @@ struct tm * gmtime (const time_t *timer) time_t _time64 (time_t* t) {=0D return time (t);=0D }=0D -=0D -struct tm *mbedtls_platform_gmtime_r( const time_t *tt,=0D - struct tm *tm_buf )=0D -{=0D - struct tm * lt;=0D -=0D - lt =3D gmtime (tt);=0D -=0D - if (lt !=3D NULL) {=0D - CopyMem (tm_buf, lt, sizeof(struct tm));=0D - }=0D -=0D - return ((lt =3D=3D NULL) ? NULL : tm_buf);=0D -}=0D diff --git a/CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf b/CryptoPkg/Librar= y/MbedTlsLib/MbedTlsLib.inf index 69d712b9c6..e2fd9e6e1e 100644 --- a/CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf +++ b/CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf @@ -109,6 +109,7 @@ mbedtls/library/x509_crt.c=0D mbedtls/library/x509_csr.c=0D mbedtls/library/pkcs7.c=0D + mbedtls/library/platform_util.c=0D =0D [Packages]=0D MdePkg/MdePkg.dec=0D --=20 2.26.2.windows.1