Merge pull request #571 from fortanix/yx/upgrade-mbedtls

Upgrade dependence of mbedtls and prepare for releases
fortanix · Apr 12, 2024 · 0279dbf · 0279dbf
2 parents a5eff2f + 13319ba
commit 0279dbf
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/em-app/Cargo.toml b/em-app/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "em-app"
-version = "0.5.0"
+version = "0.4.0"
 authors = ["fortanix.com"]
 license = "MPL-2.0"
 edition = "2018"
@@ -14,7 +14,7 @@ b64-ct = "0.1.0"
 em-client = { version = "3.0.0", default-features = false, features = ["client"] }
 em-node-agent-client = "1.0.0"
 hyper = { version = "0.10", default-features = false }
-mbedtls = { version = "0.9", features = [ "rdrand", "std", "force_aesni_support", "mpi_force_c_code" ], default-features = false }
+mbedtls = { version = "0.12", default-features = false, features = ["rdrand", "std", "ssl"] }
 pkix = ">=0.1.2, <0.3.0"
 
 rustc-serialize = "0.3.24"

diff --git a/em-app/examples/get-certificate/Cargo.toml b/em-app/examples/get-certificate/Cargo.toml
@@ -4,8 +4,9 @@ version = "0.2.0"
 authors = ["fortanix.com"]
 edition = "2018"
 license = "MPL-2.0"
+publish = false
 
 [dependencies]
 em-app = { path = "../../" }
-mbedtls = { version = "0.9", features = [ "rdrand", "std", "force_aesni_support", "mpi_force_c_code" ], default-features = false }
+mbedtls = { version = "0.12", default-features = false, features = ["std"] }
 serde_json = "1.0"
diff --git a/examples/tls/Cargo.toml b/examples/tls/Cargo.toml
@@ -3,7 +3,8 @@ name = "tls"
 version = "0.1.0"
 authors = ["fortanix.com"]
 edition = "2018"
+publish = false
 
 [dependencies]
 chrono = "0.4"
-mbedtls = {version="0.5", default-features = false, features = ["sgx"]}
+mbedtls = { version = "0.12", default-features = false, features = ["std"] }
diff --git a/fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify/Cargo.toml b/fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify/Cargo.toml
@@ -3,14 +3,15 @@ name = "nitro-attestation-verify"
 version = "0.1.1"
 authors = ["Adrian Cruceru <[email protected]>"]
 edition = "2018"
+publish = false
 
 [dependencies]
 chrono = "0.4"
 serde_cbor = "0.11"
 # Required until PR36 is accepted
 # https://github.com/awslabs/aws-nitro-enclaves-cose/pull/36
 aws-nitro-enclaves-cose = { version = "0.5.0", git = "https://github.com/fortanix/aws-nitro-enclaves-cose.git", branch = "raoul/crypto_abstraction_pinned", default-features = false }
-mbedtls = { version = ">=0.8.0, <0.10.0", features = ["rdrand", "std", "time"], default-features = false, optional = true }
+mbedtls = { version = "0.12", features = ["rdrand", "std", "time", "ssl"], default-features = false, optional = true }
 num-bigint = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = "0.11"

diff --git a/intel-sgx/dcap-ql/Cargo.toml b/intel-sgx/dcap-ql/Cargo.toml
@@ -45,15 +45,15 @@ byteorder = "1.1.0" # Unlicense/MIT
 anyhow = "1.0"   # MIT/Apache-2.0
 lazy_static = "1"   # MIT/Apache-2.0
 libc = { version = "0.2", optional = true }        # MIT/Apache-2.0
-mbedtls = { version = ">=0.8.0, <0.10.0", default-features = false, features = ["std"], optional = true }
+mbedtls = { version = "0.12", default-features = false, features = ["std", "x509"], optional = true }
 num = { version = "0.2", optional = true }
 num-derive = "0.2"  # MIT/Apache-2.0
 num-traits = "0.2"  # MIT/Apache-2.0
 serde = { version = "1.0.104", features = ["derive"], optional = true } # MIT/Apache-2.0
 yasna = { version = "0.3", features = ["num-bigint", "bit-vec"], optional = true }
 
 [dev-dependencies]
-mbedtls = { version = ">=0.8.0, <0.10.0" }
+mbedtls = { version = "0.12" }
 report-test = { version = "0.4.0", path = "../report-test" }
 sgxs = { version = "0.8.0", path = "../sgxs" }
 serde = { version = "1.0.104", features = ["derive"] }

diff --git a/intel-sgx/ias/Cargo.toml b/intel-sgx/ias/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ias"
-version = "0.1.2"
+version = "0.2.0"
 authors = ["Fortanix, Inc."]
 license = "MPL-2.0"
 edition = "2018"
@@ -20,7 +20,7 @@ serde_json = { version = "1", optional = true }
 serde = { version = "1.0.7", features = ["derive"] }
 url = "2.2"
 
-mbedtls = { version = ">=0.8.0, <0.10.0", features = ["std"], default-features = false, optional = true }
+mbedtls = { version = "0.12", features = ["std"], default-features = false, optional = true }
 pkix = "0.1"
 
 sgx-isa = { version = "0.4", path = "../sgx-isa" }

diff --git a/intel-sgx/sgx-isa/Cargo.toml b/intel-sgx/sgx-isa/Cargo.toml
@@ -17,7 +17,7 @@ categories = ["hardware-support"]
 
 [dev-dependencies]
 # External dependencies
-mbedtls = { version = ">=0.8.0, <0.10.0", default-features = false, features = ["std"] }
+mbedtls = { version = "0.12", default-features = false, features = ["std"] }
 
 [dependencies]
 # External dependencies