Update submodules (add support for mbedTLS 3.x) (#2662)

* Update submodules (add support for mbedTLS 3.x) * Fix submodule reference
Azure · Jan 7, 2025 · 56b3712 · 56b3712
1 parent 7afef61
commit 56b3712
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 5 deletions.
diff --git a/build/.vsts-ci.yml b/build/.vsts-ci.yml
@@ -3,6 +3,9 @@ variables:
   runCodesignValidationInjection: false
 resources:
   containers:
+  - container: linux-c-ubuntu-2404
+    endpoint: csdk-containers
+    image: csdkcontainerregistry.azurecr.io/linux-c-ubuntu-2404:latest
   - container: linux-c-ubuntu-2204
     endpoint: csdk-containers
     image: csdkcontainerregistry.azurecr.io/linux-c-ubuntu-2204:latest
@@ -830,6 +833,86 @@ stages:
         mergeTestResults: true
         testRunTitle: 'mbedtls'
       condition: succeededOrFailed()
+  - job: mbedtls228
+    container: linux-c-ubuntu-2204
+    pool:
+      name: 'sdk-c--ubuntu-22'
+    displayName: 'mbedTLS 2.28'
+    steps:
+    - script: |
+        sudo -E bash jenkins/linux_mbedtls.sh
+      displayName: 'Build'
+    - script: |
+        cd cmake && sudo -E ../build_all/linux/run_tests.sh
+      env:
+        IOTHUB_CONNECTION_STRING: $(IOTHUB-CONNECTION-STRING)
+        IOTHUB_EVENTHUB_CONNECTION_STRING: $(IOTHUB-EVENTHUB-CONNECTION-STRING)
+        IOTHUB_E2E_X509_CERT_BASE64: $(IOTHUB-E2E-X509-CERT-BASE64)
+        IOTHUB_E2E_X509_PRIVATE_KEY_BASE64: $(IOTHUB-E2E-X509-PRIVATE-KEY-BASE64)
+        IOTHUB_E2E_X509_THUMBPRINT: $(IOTHUB-E2E-X509-THUMBPRINT)
+        IOTHUB_POLICY_KEY: $(IOTHUB-POLICY-KEY)
+        STORAGE_ACCOUNT_CONNECTION_STRING: $(STORAGE-ACCOUNT-CONNECTION-STRING)
+        IOT_DPS_CONNECTION_STRING: $(IOT-DPS-CONNECTION-STRING)
+        IOT_DPS_ID_SCOPE: $(IOT-DPS-ID-SCOPE)
+        IOTHUB_CA_ROOT_CERT: $(IOTHUB-CA-ROOT-CERT)
+        IOTHUB_CA_ROOT_CERT_KEY: $(IOTHUB-CA-ROOT-CERT-KEY)
+        IOT_DPS_GLOBAL_ENDPOINT: $(IOT-DPS-GLOBAL-ENDPOINT)
+        IOTHUB_DEVICE_CONN_STRING_INVALIDCERT: $(IOTHUB-DEVICE-CONN-STRING-INVALIDCERT)
+        IOTHUB_CONN_STRING_INVALIDCERT: $(IOTHUB-CONN-STRING-INVALIDCERT)
+        DPS_GLOBALDEVICEENDPOINT_INVALIDCERT: $(DPS-GLOBALDEVICEENDPOINT-INVALIDCERT)
+        PROVISIONING_CONNECTION_STRING_INVALIDCERT: $(PROVISIONING-CONNECTION-STRING-INVALIDCERT)
+        IOT_DPS_INDIVIDUAL_X509_CERTIFICATE: $(IOTHUB-E2E-X509-ECC-CERT-BASE64)
+        IOT_DPS_INDIVIDUAL_X509_KEY: $(IOTHUB-E2E-X509-ECC-PRIVATE-KEY-BASE64)
+        IOT_DPS_INDIVIDUAL_REGISTRATION_ID: $(IOT-DPS-INDIVIDUAL-REGISTRATION-ID)
+      displayName: "Run Tests"
+    - task: PublishTestResults@2
+      displayName: 'Publish mbedTLS Results'
+      inputs:
+        testRunner: CTest
+        testResultsFiles: '**/Test.xml'
+        mergeTestResults: true
+        testRunTitle: 'mbedtls'
+      condition: succeededOrFailed()
+  - job: mbedtls3x
+    container: linux-c-ubuntu-2404
+    pool:
+      name: 'sdk-c--ubuntu-22'
+    displayName: 'mbedTLS 3.x'
+    steps:
+    - script: |
+        sudo -E bash jenkins/linux_mbedtls.sh
+      displayName: 'Build'
+    - script: |
+        cd cmake && sudo -E ../build_all/linux/run_tests.sh
+      env:
+        IOTHUB_CONNECTION_STRING: $(IOTHUB-CONNECTION-STRING)
+        IOTHUB_EVENTHUB_CONNECTION_STRING: $(IOTHUB-EVENTHUB-CONNECTION-STRING)
+        IOTHUB_E2E_X509_CERT_BASE64: $(IOTHUB-E2E-X509-CERT-BASE64)
+        IOTHUB_E2E_X509_PRIVATE_KEY_BASE64: $(IOTHUB-E2E-X509-PRIVATE-KEY-BASE64)
+        IOTHUB_E2E_X509_THUMBPRINT: $(IOTHUB-E2E-X509-THUMBPRINT)
+        IOTHUB_POLICY_KEY: $(IOTHUB-POLICY-KEY)
+        STORAGE_ACCOUNT_CONNECTION_STRING: $(STORAGE-ACCOUNT-CONNECTION-STRING)
+        IOT_DPS_CONNECTION_STRING: $(IOT-DPS-CONNECTION-STRING)
+        IOT_DPS_ID_SCOPE: $(IOT-DPS-ID-SCOPE)
+        IOTHUB_CA_ROOT_CERT: $(IOTHUB-CA-ROOT-CERT)
+        IOTHUB_CA_ROOT_CERT_KEY: $(IOTHUB-CA-ROOT-CERT-KEY)
+        IOT_DPS_GLOBAL_ENDPOINT: $(IOT-DPS-GLOBAL-ENDPOINT)
+        IOTHUB_DEVICE_CONN_STRING_INVALIDCERT: $(IOTHUB-DEVICE-CONN-STRING-INVALIDCERT)
+        IOTHUB_CONN_STRING_INVALIDCERT: $(IOTHUB-CONN-STRING-INVALIDCERT)
+        DPS_GLOBALDEVICEENDPOINT_INVALIDCERT: $(DPS-GLOBALDEVICEENDPOINT-INVALIDCERT)
+        PROVISIONING_CONNECTION_STRING_INVALIDCERT: $(PROVISIONING-CONNECTION-STRING-INVALIDCERT)
+        IOT_DPS_INDIVIDUAL_X509_CERTIFICATE: $(IOTHUB-E2E-X509-ECC-CERT-BASE64)
+        IOT_DPS_INDIVIDUAL_X509_KEY: $(IOTHUB-E2E-X509-ECC-PRIVATE-KEY-BASE64)
+        IOT_DPS_INDIVIDUAL_REGISTRATION_ID: $(IOT-DPS-INDIVIDUAL-REGISTRATION-ID)
+      displayName: "Run Tests"
+    - task: PublishTestResults@2
+      displayName: 'Publish mbedTLS Results'
+      inputs:
+        testRunner: CTest
+        testResultsFiles: '**/Test.xml'
+        mergeTestResults: true
+        testRunTitle: 'mbedtls'
+      condition: succeededOrFailed()
   - job: cares
     container: linux-c-ubuntu-c-ares
     pool: 

diff --git a/c-utility b/c-utility
diff --git a/deps/uhttp b/deps/uhttp
diff --git a/provisioning_client/deps/utpm b/provisioning_client/deps/utpm
diff --git a/uamqp b/uamqp
diff --git a/umqtt b/umqtt
+44 −1		adapters/httpapi_curl.c
+54 −2		adapters/tlsio_mbedtls.c
+13 −0		tests/tlsio_mbedtls_ut/tlsio_mbedtls_ut.c