Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/ns/fix_failure_vulnerability' in…
Browse files Browse the repository at this point in the history
…to ns/fix_failure_vulnerability
  • Loading branch information
nshyrei committed Mar 12, 2024
2 parents b399517 + d989cfe commit 5c0cbd5
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion em-app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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 }
pkix = "0.1.2"
pkix = ">=0.1.2, <0.3.0"

rustc-serialize = "0.3.24"
sdkms = { version = "0.2.1", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/dcap-provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ crate-type = ["cdylib"]
[dependencies]
# Project dependencies
"dcap-ql" = { version = "0.4.0", path = "../dcap-ql", features = ["link"] }
"report-test" = { version = "0.4.1", path = "../report-test" }
"report-test" = { version = "0.4.0", path = "../report-test" }

# External dependencies
byteorder = "1.1.0" # Unlicense/MIT
Expand Down
4 changes: 2 additions & 2 deletions intel-sgx/dcap-ql/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dcap-ql"
version = "0.4.7"
version = "0.4.0"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
description = """
Expand Down Expand Up @@ -54,7 +54,7 @@ yasna = { version = "0.3", features = ["num-bigint", "bit-vec"], optional = true

[dev-dependencies]
mbedtls = { version = ">=0.8.0, <0.10.0" }
report-test = { version = "0.4.1", path = "../report-test" }
report-test = { version = "0.4.0", path = "../report-test" }
sgxs = { version = "0.8.0", path = "../sgxs" }
serde = { version = "1.0.104", features = ["derive"] }
serde_json = { version = "1.0" }
4 changes: 2 additions & 2 deletions intel-sgx/dcap-retrieve-pckid/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dcap-retrieve-pckid"
version = "0.2.3"
version = "0.2.0"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
edition = "2018"
Expand All @@ -16,7 +16,7 @@ categories = ["command-line-utilities"]
# Project dependencies
"aesm-client" = { version = "0.6.0", path = "../aesm-client", features = ["sgxs"] }
"dcap-ql" = { version = "0.4.0", path = "../dcap-ql", default-features = false }
"report-test" = { version = "0.4.1", path = "../report-test" }
"report-test" = { version = "0.4.0", path = "../report-test" }
"sgx-isa" = { version = "0.4.0", path = "../sgx-isa" }
"sgxs-loaders" = { version = "0.4.0", path = "../sgxs-loaders" }

Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/enclave-runner/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "enclave-runner"
version = "0.6.2"
version = "0.6.0"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/fortanix-sgx-tools/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fortanix-sgx-tools"
version = "0.6.1"
version = "0.6.0"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
description = """
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/report-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "report-test"
version = "0.4.3"
version = "0.4.0"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
description = """
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/sgxs-loaders/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sgxs-loaders"
version = "0.4.3"
version = "0.4.0"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/sgxs-tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ path = "src/sgx_detect/main.rs"
"sgxs-loaders" = { version = "0.4.0", path = "../sgxs-loaders" }
"aesm-client" = { version = "0.6.0", path = "../aesm-client", features = ["sgxs"] }
"sgx-isa" = { version = "0.4.0", path = "../sgx-isa" }
"report-test" = { version = "0.4.1", path = "../report-test" }
"report-test" = { version = "0.4.0", path = "../report-test" }
"enclave-runner" = { version = "0.6.0", path = "../enclave-runner" }

# External dependencies
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/sgxs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sgxs"
version = "0.8.4"
version = "0.8.0"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
description = """
Expand Down

0 comments on commit 5c0cbd5

Please sign in to comment.