From 64655890546659702a01865060ed602103287504 Mon Sep 17 00:00:00 2001 From: Raoul Strackx Date: Tue, 5 Mar 2024 14:48:31 +0100 Subject: [PATCH 1/2] Indicate that `em-app` is compatible with both `pkix` 0.1 and 0.2 versions --- em-app/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/em-app/Cargo.toml b/em-app/Cargo.toml index aee6d126..05fe843d 100644 --- a/em-app/Cargo.toml +++ b/em-app/Cargo.toml @@ -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 } From 45a5539c52997e4dff5687d6f255184fe0955e50 Mon Sep 17 00:00:00 2001 From: Nikita Shyrei Date: Tue, 12 Mar 2024 14:28:39 +0100 Subject: [PATCH 2/2] Properly update minor version Co-authored-by: YX Cao --- intel-sgx/aesm-client/Cargo.toml | 2 +- intel-sgx/dcap-provider/Cargo.toml | 2 +- intel-sgx/dcap-ql/Cargo.toml | 4 ++-- intel-sgx/dcap-retrieve-pckid/Cargo.toml | 4 ++-- intel-sgx/enclave-runner/Cargo.toml | 2 +- intel-sgx/fortanix-sgx-tools/Cargo.toml | 2 +- intel-sgx/report-test/Cargo.toml | 2 +- intel-sgx/sgxs-loaders/Cargo.toml | 2 +- intel-sgx/sgxs-tools/Cargo.toml | 2 +- intel-sgx/sgxs/Cargo.toml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/intel-sgx/aesm-client/Cargo.toml b/intel-sgx/aesm-client/Cargo.toml index c7d9b861..ac0b6ef0 100644 --- a/intel-sgx/aesm-client/Cargo.toml +++ b/intel-sgx/aesm-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aesm-client" -version = "0.6.4" +version = "0.6.0" authors = ["Fortanix, Inc."] license = "MPL-2.0" description = """ diff --git a/intel-sgx/dcap-provider/Cargo.toml b/intel-sgx/dcap-provider/Cargo.toml index 02950cd6..46ad2914 100644 --- a/intel-sgx/dcap-provider/Cargo.toml +++ b/intel-sgx/dcap-provider/Cargo.toml @@ -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 diff --git a/intel-sgx/dcap-ql/Cargo.toml b/intel-sgx/dcap-ql/Cargo.toml index 954e8277..0488c672 100644 --- a/intel-sgx/dcap-ql/Cargo.toml +++ b/intel-sgx/dcap-ql/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dcap-ql" -version = "0.4.7" +version = "0.4.0" authors = ["Fortanix, Inc."] license = "MPL-2.0" description = """ @@ -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" } diff --git a/intel-sgx/dcap-retrieve-pckid/Cargo.toml b/intel-sgx/dcap-retrieve-pckid/Cargo.toml index 74ee3318..bffddc56 100644 --- a/intel-sgx/dcap-retrieve-pckid/Cargo.toml +++ b/intel-sgx/dcap-retrieve-pckid/Cargo.toml @@ -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" @@ -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" } diff --git a/intel-sgx/enclave-runner/Cargo.toml b/intel-sgx/enclave-runner/Cargo.toml index 1f2ba6ec..73cbeac2 100644 --- a/intel-sgx/enclave-runner/Cargo.toml +++ b/intel-sgx/enclave-runner/Cargo.toml @@ -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" diff --git a/intel-sgx/fortanix-sgx-tools/Cargo.toml b/intel-sgx/fortanix-sgx-tools/Cargo.toml index 224376da..6137f116 100644 --- a/intel-sgx/fortanix-sgx-tools/Cargo.toml +++ b/intel-sgx/fortanix-sgx-tools/Cargo.toml @@ -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 = """ diff --git a/intel-sgx/report-test/Cargo.toml b/intel-sgx/report-test/Cargo.toml index eb7ad033..d8fe17cb 100644 --- a/intel-sgx/report-test/Cargo.toml +++ b/intel-sgx/report-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "report-test" -version = "0.4.3" +version = "0.4.0" authors = ["Fortanix, Inc."] license = "MPL-2.0" description = """ diff --git a/intel-sgx/sgxs-loaders/Cargo.toml b/intel-sgx/sgxs-loaders/Cargo.toml index 3b30793c..e933b4c5 100644 --- a/intel-sgx/sgxs-loaders/Cargo.toml +++ b/intel-sgx/sgxs-loaders/Cargo.toml @@ -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" diff --git a/intel-sgx/sgxs-tools/Cargo.toml b/intel-sgx/sgxs-tools/Cargo.toml index 2096941d..ef49b976 100644 --- a/intel-sgx/sgxs-tools/Cargo.toml +++ b/intel-sgx/sgxs-tools/Cargo.toml @@ -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 diff --git a/intel-sgx/sgxs/Cargo.toml b/intel-sgx/sgxs/Cargo.toml index 670a9fcd..47c05dcd 100644 --- a/intel-sgx/sgxs/Cargo.toml +++ b/intel-sgx/sgxs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sgxs" -version = "0.8.4" +version = "0.8.0" authors = ["Fortanix, Inc."] license = "MPL-2.0" description = """