From nobody Tue Feb 10 01:59:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109161+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109161+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1695915281; cv=none; d=zohomail.com; s=zohoarc; b=hKYONg5BvWv2GU0MmVY2pldasjWFw7CfvHIouq7eRP3uUgOMU29M1zuzGD3LvP6xKEFTCZKQCdmWNcr87bEoVnfrFt5VPDnBYx1MRm83Lje4LpP66Zp+67Yg6IlIFsw8jH1Mi4TebdWN0sbjTZg1EX84a9UPIQOD9wWUIcWXB/U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695915281; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=tlN5hVl1fs8WP8BToDwDiLEpjnsB+LtyN9QZ21vc9ok=; b=GLrT3/BD110kuV47pLesnzPcsMvuY+oG6X1WgRjjpRscYhfNI5DCaMJX0VKtrezLX5tJ1P0j5q5GxUHnXVBqUjWw6wK6L9i5ebiJWus9JPYV6KZy56+NjcqAFssjOIQF/QLpJSnsqcx/6L4Tz5ZioqdWuy3wPLm/NDHQtkEpLmI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109161+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1695915281818919.0819855745117; Thu, 28 Sep 2023 08:34:41 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=1MR8X/YTJQATEsiVnyudK4ed7eRuGDfjFwYNkxWhWeQ=; 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=1695915281; v=1; b=bT3YiQffGR8elegnQNEcfAOVH21f/ms9M5gQgO6fr0TJRGwphEHwBgEv2HQ2DJGJeWZnK5wb bwikzD3+zvOSXAItm3raY5s8N2twAW7//rrAMTIB6MYplNrPJH800nFn1O9Ka9DTpOo4BUsmiPy uDarT3LgkuCH4AKHWOTv1WQs= X-Received: by 127.0.0.2 with SMTP id CkLoYY1788612xcAIL969EmZ; Thu, 28 Sep 2023 08:34:41 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by mx.groups.io with SMTP id smtpd.web10.16607.1695915264250602914 for ; Thu, 28 Sep 2023 08:34:40 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="704030" X-IronPort-AV: E=Sophos;i="6.03,184,1694761200"; d="scan'208";a="704030" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Sep 2023 08:34:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="778943275" X-IronPort-AV: E=Sophos;i="6.03,184,1694761200"; d="scan'208";a="778943275" X-Received: from shwdejointd777.ccr.corp.intel.com ([10.239.58.116]) by orsmga008.jf.intel.com with ESMTP; 28 Sep 2023 08:34:39 -0700 From: "Wenxing Hou" To: devel@edk2.groups.io Cc: Jiewen Yao , Yi Li , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH v3 09/11] CryptoPkg: Add Mbedtls submodule in CI Date: Thu, 28 Sep 2023 23:34:14 +0800 Message-Id: <20230928153416.537-10-wenxing.hou@intel.com> In-Reply-To: <20230928153416.537-1-wenxing.hou@intel.com> References: <20230928153416.537-1-wenxing.hou@intel.com> 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,wenxing.hou@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: IDEVrzDoqQqm9XKmzls9OTGwx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1695915283026100031 Content-Type: text/plain; charset="utf-8" Change CI for new Mbedtls submodule. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4177 Cc: Jiewen Yao Cc: Yi Li Cc: Xiaoyu Lu Cc: Guomin Jiang Signed-off-by: Wenxing Hou Reviewed-by: Michael D Kinney --- .pytool/CISettings.py | 2 ++ CryptoPkg/CryptoPkg.ci.yaml | 12 +++++++++++- CryptoPkg/CryptoPkg.dec | 3 ++- CryptoPkg/CryptoPkg.dsc | 8 ++++++++ CryptoPkg/Private/Library/MbedTlsLib.h | 12 ++++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 CryptoPkg/Private/Library/MbedTlsLib.h diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index 6fb7342f81..c5803a877c 100644 --- a/.pytool/CISettings.py +++ b/.pytool/CISettings.py @@ -199,6 +199,8 @@ class Settings(CiBuildSettingsManager, UpdateSettingsMa= nager, SetupSettingsManag "MdePkg/Library/BaseFdtLib/libfdt", False)) rs.append(RequiredSubmodule( "MdePkg/Library/MipiSysTLib/mipisyst", False)) + rs.append(RequiredSubmodule( + "CryptoPkg/Library/MbedTlsLib/mbedtls", False)) return rs =20 def GetName(self): diff --git a/CryptoPkg/CryptoPkg.ci.yaml b/CryptoPkg/CryptoPkg.ci.yaml index 59ba56d41e..967612230d 100644 --- a/CryptoPkg/CryptoPkg.ci.yaml +++ b/CryptoPkg/CryptoPkg.ci.yaml @@ -38,10 +38,20 @@ # This has OpenSSL interfaces that aren't UEFI spec compliant "Library/BaseCryptLib/Hash/CryptParallelHash.h", "Library/Include/fcntl.h", + # This has Mbedtls interfaces that aren't UEFI spec compliant + "Library/Include/stdint.h", + "Library/Include/stubs-32.h", # These directories contain auto-generated OpenSSL content "Library/OpensslLib", "Library/IntrinsicLib", - "Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c" + "Library/BaseCryptLib/Pk/CryptPkcs7VerifyBase.c", + # mbedtls + "Library/MbedTlsLib/mbedtls", + # This has mbedtls interfaces that aren't UEFI spec compliant + "Library/MbedTlsLib/EcSm2Null.c", + "Library/MbedTlsLib/CrtWrapper.c", + "Library/MbedTlsLib/Include/mbedtls/mbedtls_config.h", + "Library/BaseCryptLibMbedTls/SysCall" ] }, "CompilerPlugin": { diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec index a5fa81a338..e613b6b1ae 100644 --- a/CryptoPkg/CryptoPkg.dec +++ b/CryptoPkg/CryptoPkg.dec @@ -28,9 +28,9 @@ Library/OpensslLib/OpensslGen/include Library/OpensslLib/OpensslGen/providers/common/include Library/MbedTlsLib/Include - Library/MbedTlsLib/mbedtls Library/MbedTlsLib/mbedtls/include Library/MbedTlsLib/mbedtls/include/mbedtls + Library/MbedTlsLib/mbedtls/library =20 [LibraryClasses] ## @libraryclass Provides basic library functions for cryptographic pr= imitives. @@ -49,6 +49,7 @@ ## @libraryclass Provides library functions from the openssl project. # OpensslLib|Private/Library/OpensslLib.h + MbedTlsLib|Private/Library/MbedTlsLib.h =20 ## @libraryclass Provides compiler intrinsic functions required to lin= k openssl project. # diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc index a55dcb9668..6a0104a3bb 100644 --- a/CryptoPkg/CryptoPkg.dsc +++ b/CryptoPkg/CryptoPkg.dsc @@ -364,6 +364,14 @@ CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf + CryptoPkg/Library/BaseCryptLibMbedTls/BaseCryptLib.inf + CryptoPkg/Library/BaseCryptLibMbedTls/SecCryptLib.inf + CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf + CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf + CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf + CryptoPkg/Library/BaseCryptLibMbedTls/TestBaseCryptLib.inf + CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf + CryptoPkg/Library/MbedTlsLib/MbedTlsLibFull.inf CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf CryptoPkg/Library/TlsLib/TlsLib.inf diff --git a/CryptoPkg/Private/Library/MbedTlsLib.h b/CryptoPkg/Private/Lib= rary/MbedTlsLib.h new file mode 100644 index 0000000000..30517a76d3 --- /dev/null +++ b/CryptoPkg/Private/Library/MbedTlsLib.h @@ -0,0 +1,12 @@ +/** @file + MbedTlsLib class with APIs from the mbedtls project + + Copyright (c) 2023, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef MBEDTLS_LIB_H_ +#define MBEDTLS_LIB_H_ + +#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 (#109161): https://edk2.groups.io/g/devel/message/109161 Mute This Topic: https://groups.io/mt/101639984/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-