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

Update pkix version #582

Merged
merged 6 commits into from
Apr 20, 2024
Merged

Update pkix version #582

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
126d7ce
build: update pkix dependency
Taowyoo Apr 20, 2024
73d7e6a
build: format and improve Cargo.toml syntax
Taowyoo Apr 20, 2024
83345c2
chore: correct workspace members
Taowyoo Apr 20, 2024
c8670e4
chore: ensure all crates are mentioned in workspace
Taowyoo Apr 20, 2024
9ec4188
chore: sort crates in workspace Cargo.toml
Taowyoo Apr 20, 2024
b550151
chore: exclude unrelated files
Taowyoo Apr 20, 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
4 changes: 2 additions & 2 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.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ members = [
"em-app",
"em-app/examples/get-certificate/",
]
exclude = ["examples"]
exclude = ["examples/*"]
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" }
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" }
1 change: 1 addition & 0 deletions examples/backtrace_panic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ name = "backtrace_panic"
version = "0.1.0"
authors = ["Fortanix, Inc."]
edition = "2018"
publish = false

[dependencies]
1 change: 1 addition & 0 deletions examples/mem-alloc-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions examples/mem-correctness-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions examples/mpsc-crypto-mining/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "mpsc-crypto-mining"
version = "0.1.0"
authors = ["belfz <[email protected]>"]
publish = false

[dependencies]
easy-hash = "0.1.0"
Expand Down
1 change: 1 addition & 0 deletions examples/unit_tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "rust-sgx-ut"
version = "0.1.0"
authors = ["Fortanix, Inc."]
publish = false

[dependencies]
serde = { version = "1.0", features = ["derive"] }
Expand Down
1 change: 1 addition & 0 deletions examples/usercall-extension-bind/app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ name = "app"
version = "0.1.0"
authors = ["Vardhan Thigle <[email protected]>"]
edition = "2018"
publish = false

[dependencies]
1 change: 1 addition & 0 deletions examples/usercall-extension-bind/runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
1 change: 1 addition & 0 deletions examples/usercall-extension/app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ name = "app"
version = "0.1.0"
authors = ["Vardhan Thigle <[email protected]>"]
edition = "2018"
publish = false

[dependencies]
1 change: 1 addition & 0 deletions examples/usercall-extension/runner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions fortanix-vme/aws-nitro-enclaves/tests/nsm-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
4 changes: 2 additions & 2 deletions fortanix-vme/vme-pkix/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -13,4 +13,4 @@ categories = ["cryptography"]

[dependencies]
lazy_static = "1"
pkix = "0.1.1"
pkix = ">=0.1.0, <0.3.0"
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.2.0"
version = "0.2.1"
authors = ["Fortanix, Inc."]
license = "MPL-2.0"
edition = "2018"
Expand All @@ -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" }
Expand Down
Loading