[edk2-devel] [PATCH v2 09/10] CryptoPkg: Add Mbedtls submodule in CI

[Wenxing Hou]

Change CI for new Mbedtls submodule.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4177

Cc: Jiewen Yao <jiewen.yao at intel.com>
Cc: Yi Li <yi1.li at intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu at intel.com>
Cc: Guomin Jiang <guomin.jiang at intel.com>
Signed-off-by: Wenxing Hou <wenxing.hou at intel.com>
---
 .pytool/CISettings.py       |  2 ++
 CryptoPkg/CryptoPkg.ci.yaml | 66 +++++++++++++++++++++++++++++++++++--
 2 files changed, 65 insertions(+), 3 deletions(-)

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, UpdateSettingsManager, SetupSettingsManag
             "MdePkg/Library/BaseFdtLib/libfdt", False))
         rs.append(RequiredSubmodule(
             "MdePkg/Library/MipiSysTLib/mipisyst", False))
+        rs.append(RequiredSubmodule(
+            "CryptoPkg/Library/MbedTlsLib/mbedtls", False))
         return rs
 
     def GetName(self):
diff --git a/CryptoPkg/CryptoPkg.ci.yaml b/CryptoPkg/CryptoPkg.ci.yaml
index 59ba56d41e..204b97f470 100644
--- a/CryptoPkg/CryptoPkg.ci.yaml
+++ b/CryptoPkg/CryptoPkg.ci.yaml
@@ -41,7 +41,14 @@
             # 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": {
@@ -68,7 +75,16 @@
     },
     "DscCompleteCheck": {
         "DscPath": "CryptoPkg.dsc",
-        "IgnoreInf": []
+        "IgnoreInf": [
+            "CryptoPkg/Library/BaseCryptLibMbedTls/BaseCryptLib.inf",
+            "CryptoPkg/Library/BaseCryptLibMbedTls/PeiCryptLib.inf",
+            "CryptoPkg/Library/BaseCryptLibMbedTls/RuntimeCryptLib.inf",
+            "CryptoPkg/Library/BaseCryptLibMbedTls/SecCryptLib.inf",
+            "CryptoPkg/Library/BaseCryptLibMbedTls/SmmCryptLib.inf",
+            "CryptoPkg/Library/BaseCryptLibMbedTls/TestBaseCryptLib.inf",
+            "CryptoPkg/Library/MbedTlsLib/MbedTlsLib.inf",
+            "CryptoPkg/Library/MbedTlsLib/MbedTlsLibFull.inf"
+        ]
     },
     "GuidCheck": {
         "IgnoreGuidName": [],
@@ -76,7 +92,51 @@
         "IgnoreFoldersAndFiles": []
     },
     "LibraryClassCheck": {
-        "IgnoreHeaderFile": []
+        "IgnoreHeaderFile": [
+            "Library/MbedTlsLib/mbedtls/Library/aesni.h",
+            "Library/MbedTlsLib/mbedtls/Library/bignum_core.h",
+            "Library/MbedTlsLib/mbedtls/Library/bignum_mod.h",
+            "Library/MbedTlsLib/mbedtls/Library/bignum_mod_raw.h",
+            "Library/MbedTlsLib/mbedtls/Library/bn_mul.h",
+            "Library/MbedTlsLib/mbedtls/Library/check_crypto_config.h",
+            "Library/MbedTlsLib/mbedtls/Library/cipher_wrap.h",
+            "Library/MbedTlsLib/mbedtls/Library/common.h",
+            "Library/MbedTlsLib/mbedtls/Library/constant_time_internal.h",
+            "Library/MbedTlsLib/mbedtls/Library/constant_time_invasive.h",
+            "Library/MbedTlsLib/mbedtls/Library/ecp_internal_alt.h",
+            "Library/MbedTlsLib/mbedtls/Library/ecp_invasive.h",
+            "Library/MbedTlsLib/mbedtls/Library/entropy_poll.h",
+            "Library/MbedTlsLib/mbedtls/Library/hash_info.h",
+            "Library/MbedTlsLib/mbedtls/Library/lmots.h",
+            "Library/MbedTlsLib/mbedtls/Library/md_wrap.h",
+            "Library/MbedTlsLib/mbedtls/Library/mps_common.h",
+            "Library/MbedTlsLib/mbedtls/Library/mps_error.h",
+            "Library/MbedTlsLib/mbedtls/Library/mps_reader.h",
+            "Library/MbedTlsLib/mbedtls/Library/mps_trace.h",
+            "Library/MbedTlsLib/mbedtls/Library/padlock.h",
+            "Library/MbedTlsLib/mbedtls/Library/pkwrite.h",
+            "Library/MbedTlsLib/mbedtls/Library/pk_wrap.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_aead.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_cipher.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_driver_wrappers.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_ecp.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_hash.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_invasive.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_its.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_mac.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_random_impl.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_core.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_rsa.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_se.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_slot_management.h",
+            "Library/MbedTlsLib/mbedtls/Library/psa_crypto_storage.h",
+            "Library/MbedTlsLib/mbedtls/Library/rsa_alt_helpers.h",
+            "Library/MbedTlsLib/mbedtls/Library/ssl_client.h",
+            "Library/MbedTlsLib/mbedtls/Library/ssl_debug_helpers.h",
+            "Library/MbedTlsLib/mbedtls/Library/ssl_misc.h",
+            "Library/MbedTlsLib/mbedtls/Library/ssl_tls13_invasive.h",
+            "Library/MbedTlsLib/mbedtls/Library/ssl_tls13_keys.h"
+        ]
     },
 
     ## options defined ci/Plugin/SpellCheck
-- 
2.26.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108244): https://edk2.groups.io/g/devel/message/108244
Mute This Topic: https://groups.io/mt/101114034/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-