Switch to a submodule for the vendored mbedtls

.github/workflows/publish-crates.yml

@@ -19,6 +19,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+        with:
+          submodules: true
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:

.github/workflows/test.yml

@@ -62,6 +62,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
 
     - name: Install qemu-user for aarch64 target
       if: matrix.target == 'aarch64-unknown-linux-musl'
@@ -114,6 +116,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
@@ -124,21 +128,24 @@ jobs:
           cargo fmt --check -p mbedtls-platform-support
           cargo fmt --check -p mbedtls-sys-auto
 
-  bench:
-    name: Cargo bench
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: stable
-      - uses: boa-dev/criterion-compare-action@v3
-        name: Run criterion-compare-action
-        with:
-          cwd: "mbedtls"
-          benchName: "cipher"
-          branchName: ${{ github.base_ref }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+  # Temporarily disbaling this, as boa-dev/criterion-compare-action@v3 does not handle submodules
+  # bench:
+  #   name: Cargo bench
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #       with:
+  #         submodules: true
+  #     - uses: dtolnay/rust-toolchain@master
+  #       with:
+  #         toolchain: stable
+  #     - uses: boa-dev/criterion-compare-action@v3
+  #       name: Run criterion-compare-action
+  #       with:
+  #         cwd: "mbedtls"
+  #         benchName: "cipher"
+  #         branchName: ${{ github.base_ref }}
+  #         token: ${{ secrets.GITHUB_TOKEN }}
 
   ci-success:
     name: ci

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "mbedtls-sys/vendor"]
+	path = mbedtls-sys/vendor
+	url = https://github.com/fortanix/mbedtls
+	branch = mbedtls-2.28-rust-mbedtls

mbedtls-sys/Cargo.toml

@@ -1,6 +1,8 @@
 [package]
 name = "mbedtls-sys-auto"
-version = "2.28.7"
+# This version should match the version of upstream c mbedtls, except that the patch component should
+# be 1000 * upstream_patch + our_patch. For example, version 2.28.9001 corresponds to c mbedtls 2.28.9
+version = "2.28.9000"
 authors = ["Jethro Beekman <[email protected]>"]
 build = "build/build.rs"
 license = "Apache-2.0 OR GPL-2.0-or-later"
@@ -15,8 +17,8 @@ links = "mbedtls"
 
 [package.metadata.mbedtls]
 git = "https://github.com/Mbed-TLS/mbedtls.git"
-version = "2.28.7"
-rev = "555f84735aecdbd76a566cf087ec8425dfb0c8ab"
+version = "2.28.9+"
+rev = "9b1ec06287f022baba9623b6f45688c4276e4955"
 
 [lib]
 name = "mbedtls_sys"