Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade dependence of mbedtls and prepare for releases #571

Merged
merged 2 commits into from
Apr 12, 2024
Merged

Upgrade dependence of mbedtls and prepare for releases #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff7e504
build: update mbedtls version
Taowyoo Apr 12, 2024
13319ba
build: update/correct new version of crates
Taowyoo Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions em-app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion em-app/examples/get-certificate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 2 additions & 1 deletion examples/tls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
3 changes: 2 additions & 1 deletion fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions intel-sgx/dcap-ql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
4 changes: 2 additions & 2 deletions intel-sgx/ias/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ias"
version = "0.1.2"
version = "0.2.0"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
edition = "2018"
Expand All @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/sgx-isa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down