Merge pull request #582 from fortanix/yx/new-versions-2

Update pkix version

Author: Taowyoo

Diff for: .gitignore

@@ -1 +1,3 @@
 /target
+.vscode
+.idea

Diff for: .idea/encodings.xml

@@ -1,15 +1,19 @@
 [workspace]
 members = [
+    "em-app",
+    "em-app/examples/get-certificate",
+    "examples/mem-alloc-test",
+    "examples/mem-correctness-test",
     "fortanix-vme/aws-nitro-enclaves/eif-tools",
-    "fortanix-vme/aws-nitro-enclaves/nsm",
     "fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify",
+    "fortanix-vme/aws-nitro-enclaves/nsm",
     "fortanix-vme/aws-nitro-enclaves/tests/nsm-test",
     "fortanix-vme/fortanix-vme-abi",
     "fortanix-vme/fortanix-vme-runner",
     "fortanix-vme/tests/hello_world",
-    "fortanix-vme/tests/outgoing_connection",
     "fortanix-vme/tests/incoming_connection",
     "fortanix-vme/tests/iron",
+    "fortanix-vme/tests/outgoing_connection",
     "fortanix-vme/vme-pkix",
     "intel-sgx/aesm-client",
     "intel-sgx/async-usercalls",
@@ -22,22 +26,30 @@ members = [
     "intel-sgx/fortanix-sgx-tools",
     "intel-sgx/ias",
     "intel-sgx/report-test",
-    "intel-sgx/sgxs",
-    "intel-sgx/sgx-isa",
     "intel-sgx/sgx_pkix",
+    "intel-sgx/sgx-isa",
     "intel-sgx/sgxs-loaders",
     "intel-sgx/sgxs-tools",
+    "intel-sgx/sgxs",
     "ipc-queue",
     "rs-libc",
-    "em-app",
-    "em-app/examples/get-certificate/",
 ]
-exclude = ["examples"]
+exclude = [
+    "examples/backtrace_panic",
+    "examples/mpsc-crypto-mining",
+    "examples/tls",
+    "examples/unit_tests",
+    "examples/usercall-extension-bind/app",
+    "examples/usercall-extension-bind/runner",
+    "examples/usercall-extension/app",
+    "examples/usercall-extension/runner",
+    "intel-sgx/sgxs-loaders/tests/driver-crawler",
+]
 resolver = "2"
 
 [patch.crates-io]
-libc  = { git = "https://github.com/fortanix/libc.git", branch = "fortanixvme" }
-nix   = { git = "https://github.com/fortanix/nix.git", branch = "raoul/fortanixvme_r0.20.2" }
+libc = { git = "https://github.com/fortanix/libc.git", branch = "fortanixvme" }
+nix = { git = "https://github.com/fortanix/nix.git", branch = "raoul/fortanixvme_r0.20.2" }
+rustc-serialize = { git = "https://github.com/fortanix/rustc-serialize.git", branch = "portability" }
 serde = { git = "https://github.com/fortanix/serde.git", branch = "master" }
 vsock = { git = "https://github.com/fortanix/vsock-rs.git", branch = "fortanixvme" }
-rustc-serialize = { git = "https://github.com/fortanix/rustc-serialize.git", branch = "portability" }

Diff for: Cargo.lock

@@ -3,5 +3,6 @@ name = "backtrace_panic"
 version = "0.1.0"
 authors = ["Fortanix, Inc."]
 edition = "2018"
+publish = false
 
 [dependencies]

Diff for: Cargo.toml

@@ -3,6 +3,7 @@ name = "mem-alloc-test"
 version = "1.0.0"
 edition = "2021"
 authors = ["Fortanix, Inc."]
+publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

Diff for: examples/backtrace_panic/Cargo.toml

@@ -2,6 +2,7 @@
 name = "mem-correctness-test"
 version = "0.1.0"
 edition = "2021"
+publish = false
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

Diff for: examples/mem-alloc-test/Cargo.toml

@@ -2,6 +2,7 @@
 name = "mpsc-crypto-mining"
 version = "0.1.0"
 authors = ["belfz <[email protected]>"]
+publish = false
 
 [dependencies]
 easy-hash = "0.1.0"

Diff for: examples/mem-correctness-test/Cargo.toml

@@ -2,6 +2,7 @@
 name = "rust-sgx-ut"
 version = "0.1.0"
 authors = ["Fortanix, Inc."]
+publish = false
 
 [dependencies]
 serde = { version = "1.0", features = ["derive"] }

Diff for: examples/mpsc-crypto-mining/Cargo.toml

@@ -3,5 +3,6 @@ name = "app"
 version = "0.1.0"
 authors = ["Vardhan Thigle <[email protected]>"]
 edition = "2018"
+publish = false
 
 [dependencies]

Diff for: examples/unit_tests/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 authors = ["Fortanix, Inc."]
 license = "MPL-2.0"
 edition = "2018"
+publish = false
 
 [dependencies]
 aesm-client = { version = "0.5.0", features = ["sgxs"], path="../../../intel-sgx/aesm-client"}

Diff for: examples/usercall-extension-bind/app/Cargo.toml

@@ -3,5 +3,6 @@ name = "app"
 version = "0.1.0"
 authors = ["Vardhan Thigle <[email protected]>"]
 edition = "2018"
+publish = false
 
 [dependencies]

Diff for: examples/usercall-extension-bind/runner/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 authors = ["Fortanix, Inc."]
 license = "MPL-2.0"
 edition = "2018"
+publish = false
 
 [dependencies]
 aesm-client = { version = "0.5.0", features = ["sgxs"], path="../../../intel-sgx/aesm-client"}

Diff for: examples/usercall-extension/app/Cargo.toml

@@ -15,12 +15,12 @@ mbedtls = { version = "0.12", features = ["rdrand", "std", "time", "ssl"], defau
 num-bigint = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = "0.11"
-pkix = "0.1"
+pkix = ">=0.1.2, <0.3.0"
 yasna = { version = "0.4", features = ["num-bigint"] }
 
 [dev-dependencies]
 chrono = "0.4.0"
-pkix = "0.1"
+pkix = ">=0.1.2, <0.3.0"
 lazy_static = "1.3.0"
 
 [features]

Diff for: examples/usercall-extension/runner/Cargo.toml

@@ -2,9 +2,9 @@
 name = "nsm-test"
 version = "0.1.0"
 edition = "2021"
-
+publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 nsm = { path = "../../nsm" }
-pkix = { version = "0.1" }
+pkix = { version = ">=0.1.2, <0.3.0" }

Diff for: fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vme-pkix"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Fortanix, Inc."]
 edition = "2018"
 license = "MPL-2.0"
@@ -13,4 +13,4 @@ categories = ["cryptography"]
 
 [dependencies]
 lazy_static = "1"
-pkix = "0.1.1"
+pkix = ">=0.1.0, <0.3.0"

Diff for: fortanix-vme/aws-nitro-enclaves/tests/nsm-test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ias"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Fortanix, Inc."]
 license = "MPL-2.0"
 edition = "2018"
@@ -21,7 +21,7 @@ serde = { version = "1.0.7", features = ["derive"] }
 url = "2.2"
 
 mbedtls = { version = "0.12", features = ["std"], default-features = false, optional = true }
-pkix = "0.1"
+pkix = ">=0.1.0, <0.3.0"
 
 sgx-isa = { version = "0.4", path = "../sgx-isa" }
 sgx_pkix = { version = "0.2", path = "../sgx_pkix" }