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

yasna & dependencies update #637

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

yasna & dependencies update #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
638 changes: 425 additions & 213 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions em-app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ categories = [ "api-bindings" ]
keywords = [ "sgx" ]

[dependencies]
b64-ct = "0.1.0"
b64-ct = "0.1.2"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this version constraint? With the specification b64-ct = "0.1.0" users are free to update to 0.1.2 if they choose. The same comment applies to many/most other changes in this PR.
See https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#specifying-dependencies-from-cratesio

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.12", default-features = false, features = ["rdrand", "std", "ssl"] }
mbedtls = { version = "0.12", git = "https://github.com/fortanix/rust-mbedtls.git", branch = "mridul/yasna-0.5-crate-update", default-features = false, features = ["rdrand", "std", "ssl"] }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't specify dependencies by pointing to git repos. Does mbedtls even expose yasna types directly? If not, it could be updated to pick up yasna and be published as a patch update. Then users of em-app will pick yasna 0.5 as a dependency of mbedtls without any update

pkix = ">=0.1.2, <0.3.0"

rustc-serialize = "0.3.24"
sdkms = { version = "0.3", default-features = false }
serde = "1.0.123"
serde = "1.0.203"
serde_bytes = "0.11"
serde_derive = "1.0.123"
serde_derive = "1.0.203"
serde_json = "1.0"
url = "1"
uuid = { version = "0.6.3", features = ["v4", "serde"] }
uuid_sdkms = { package = "uuid", version = "0.8", features = ["v4", "serde"] }

yasna = { version = "0.3", features = ["num-bigint", "bit-vec"] }
yasna = { version = "0.5", features = ["num-bigint", "bit-vec"] }

[target.x86_64-fortanix-unknown-sgx.dependencies]
sgx_pkix = { version = "0.2.0", path = "../intel-sgx/sgx_pkix" }
Expand Down
2 changes: 1 addition & 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 @@ -8,5 +8,5 @@ publish = false

[dependencies]
em-app = { path = "../../" }
mbedtls = { version = "0.12", default-features = false, features = ["std"] }
mbedtls = { version = "0.12", git = "https://github.com/fortanix/rust-mbedtls.git", branch = "mridul/yasna-0.5-crate-update", default-features = false, features = ["std"] }
serde_json = "1.0"
2 changes: 1 addition & 1 deletion examples/unit_tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Fortanix, Inc."]
publish = false

[dependencies]
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0.203", features = ["derive"] }
# Each data format lives in its own crate; the sample code below uses JSON
# but you may be using a different one.
serde_json = "1.0"
6 changes: 3 additions & 3 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 @@ -9,17 +9,17 @@ publish = false
chrono = "0.4"
serde_cbor = "0.11"
aws-nitro-enclaves-cose = { version = "0.5.0", default-features = false }
mbedtls = { version = "0.12", features = ["rdrand", "std", "time", "ssl"], default-features = false, optional = true }
mbedtls = { version = "0.12", git = "https://github.com/fortanix/rust-mbedtls.git", branch = "mridul/yasna-0.5-crate-update", features = ["rdrand", "std", "time", "ssl"], default-features = false, optional = true }
num-bigint = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_bytes = "0.11"
pkix = ">=0.1.2, <0.3.0"
yasna = { version = "0.4", features = ["num-bigint"] }
yasna = { version = "0.5", features = ["num-bigint"] }

[dev-dependencies]
chrono = "0.4.0"
pkix = ">=0.1.2, <0.3.0"
lazy_static = "1.3.0"
lazy_static = "1.5"

[features]
default = ["mbedtls"]
2 changes: 1 addition & 1 deletion fortanix-vme/tests/iron/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ edition = "2018"

[dependencies]
iron = "0.6.1"
time = "0.3.5"
time = "0.3.36"
12 changes: 6 additions & 6 deletions intel-sgx/dcap-ql/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@ verify = ["mbedtls", "num", "yasna"]
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.12", default-features = false, features = ["std", "x509"], optional = true }
libc = { version = "0.2.155", optional = true } # MIT/Apache-2.0
mbedtls = { version = "0.12", git = "https://github.com/fortanix/rust-mbedtls.git", branch = "mridul/yasna-0.5-crate-update", 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 }
serde = { version = "1.0", features = ["derive"], optional = true } # MIT/Apache-2.0
yasna = { version = "0.5", features = ["num-bigint", "bit-vec"], optional = true }

[dev-dependencies]
mbedtls = { version = "0.12" }
mbedtls = { version = "0.12", git = "https://github.com/fortanix/rust-mbedtls.git", branch = "mridul/yasna-0.5-crate-update" }
report-test = { version = "0.4.0", path = "../report-test" }
sgxs = { version = "0.8.0", path = "../sgxs" }
serde = { version = "1.0.104", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }
6 changes: 3 additions & 3 deletions intel-sgx/fortanix-sgx-tools/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ xmas-elf = "0.6.0" # Apache-2.0/MIT
clap = "2.34.0" # MIT
anyhow = "1.0" # MIT/Apache-2.0
thiserror = "1.0" # MIT/Apache-2.0
serde_derive = "1.0.84" # MIT/Apache-2.0
serde = "1.0.84" # MIT/Apache-2.0
serde_derive = "1.0.203" # MIT/Apache-2.0
serde = "1.0.203" # MIT/Apache-2.0
toml = "0.4.10" # MIT/Apache-2.0
num_cpus = "1.9.0" # MIT/Apache-2.0
libc = "0.2.48" # MIT/Apache-2.0
libc = "0.2.155" # MIT/Apache-2.0
nix = "0.13.0" # MIT
6 changes: 3 additions & 3 deletions intel-sgx/ias/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ description = "API definitions, tools, and client for the Intel Attestation Serv

[dependencies]
base64 = { version = "0.13", optional = true }
bitflags = "1"
bitflags = "2.6"
byteorder = "1.0"
log = "0.4"
percent-encoding = "2.1"
serde_bytes = "0.11"
serde-bytes-repr = { version = "0.1", optional = true }
serde_json = { version = "1", optional = true }
serde = { version = "1.0.7", features = ["derive"] }
serde = { version = "1.0.203", features = ["derive"] }
url = "2.2"

mbedtls = { version = "0.12", features = ["std"], default-features = false, optional = true }
mbedtls = { version = "0.12", git = "https://github.com/fortanix/rust-mbedtls.git", branch = "mridul/yasna-0.5-crate-update", features = ["std"], default-features = false, optional = true }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you create an issue for tracking this, we should avoid using branch version?

pkix = ">=0.1.0, <0.3.0"

sgx-isa = { version = "0.4", path = "../sgx-isa" }
Expand Down
4 changes: 2 additions & 2 deletions intel-sgx/sgx-isa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ categories = ["hardware-support"]

[dev-dependencies]
# External dependencies
mbedtls = { version = "0.12", default-features = false, features = ["std"] }
mbedtls = { version = "0.12", git = "https://github.com/fortanix/rust-mbedtls.git", branch = "mridul/yasna-0.5-crate-update", default-features = false, features = ["std"] }

[dependencies]
# External dependencies
bitflags = "1" # MIT/Apache-2.0
serde = { version = "1.0.104", features = ["derive"], optional = true } # MIT/Apache-2.0
serde = { version = "1.0.203", features = ["derive"], optional = true } # MIT/Apache-2.0

[features]
large_array_derive = []
Expand Down
4 changes: 2 additions & 2 deletions intel-sgx/sgxs-tools/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ mopa = "0.2" # MIT/Apache-2.0
syn = { version = "0.15", features = ["full"] } # MIT/Apache-2.0
fnv = "1" # MIT/Apache-2.0
proc-mounts = "0.3.0" # MIT
serde = "1.0.84" # MIT/Apache-2.0
serde_derive = "1.0.84" # MIT/Apache-2.0
serde = "1.0.203" # MIT/Apache-2.0
serde_derive = "1.0.203" # MIT/Apache-2.0
serde_yaml = "0.8.8" # MIT/Apache-2.0

[target.'cfg(unix)'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/sgxs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sgx-isa = { version = "0.4.0", path = "../sgx-isa" }

# External dependencies
byteorder = "1.0" # Unlicense/MIT
time = { version = "0.3", features = ["formatting", "local-offset", "macros", "std"] } # MIT/Apache-2.0
time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "std"] } # MIT/Apache-2.0
thiserror = "1.0" # MIT/Apache-2.0
anyhow = "1.0" # MIT/Apache-2.0
openssl = { version = "0.10", optional = true } # Apache-2.0
Expand Down
Loading