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.

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

Bump the crates-io group across 1 directory with 54 updates #583

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,601 changes: 949 additions & 652 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions em-app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,34 +13,34 @@ keywords = [ "sgx" ]
b64-ct = "0.1.0"
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 }
hyper = { version = "0.14", default-features = false }
mbedtls = { version = "0.12", default-features = false, features = ["rdrand", "std", "ssl"] }
pkix = ">=0.1.2, <0.3.0"

rustc-serialize = "0.3.24"
sdkms = { version = "0.2.1", default-features = false }
sdkms = { version = "0.3.0", default-features = false }
serde = "1.0.123"
serde_bytes = "0.11"
serde_derive = "1.0.123"
serde_json = "1.0"
url = "1"
uuid = { version = "0.6.3", features = ["v4", "serde"] }
url = "2"
uuid = { version = "0.8.2", features = ["v4", "serde"] }
uuid_sdkms = { package = "uuid", version = "0.7.4", features = ["v4", "serde"] }

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

[target.x86_64-fortanix-unknown-sgx.dependencies]
sgx_pkix = { version = "0.2.0", path = "../intel-sgx/sgx_pkix" }
sgx-isa = { version = "0.4", path = "../intel-sgx/sgx-isa", default-features = false }

[target.x86_64-unknown-linux-musl.dependencies]
aws-nitro-enclaves-nsm-api = "0.2.0"
aws-nitro-enclaves-nsm-api = "0.4.0"
vme-pkix = { version = "0.1.0", path = "../fortanix-vme/vme-pkix/" }

[target.x86_64-unknown-linux-gnu.dependencies]
aws-nitro-enclaves-nsm-api = "0.2.0"
aws-nitro-enclaves-nsm-api = "0.4.0"
vme-pkix = { version = "0.1.0", path = "../fortanix-vme/vme-pkix/" }

[target.x86_64-unknown-linux-fortanixvme.dependencies]
aws-nitro-enclaves-nsm-api = "0.2.0"
aws-nitro-enclaves-nsm-api = "0.4.0"
vme-pkix = { version = "0.1.0", path = "../fortanix-vme/vme-pkix/" }
2 changes: 1 addition & 1 deletion examples/mem-correctness-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
crossbeam = "0.8.0"
crossbeam = "0.8.4"
rand = "0.8.4"
num_cpus = "1.14.0"
sha2 = "0.10"
Expand Down
10 changes: 5 additions & 5 deletions fortanix-vme/aws-nitro-enclaves/eif-tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ categories = ["command-line-utilities"]

[dependencies]
anyhow = "1.0"
cargo_toml = "0.10.3"
clap = "2.33"
elf = "0.0.10"
cargo_toml = "0.20.0"
clap = "4.5"
elf = "0.7.4"
env_logger = "0.9"
log = "0.4"
nitro-cli = { git = "https://github.com/fortanix/aws-nitro-enclaves-cli.git", branch = "main" }
once_cell = "1.9.0"
once_cell = "1.19.0"
serde = { version = "1.0", features = ["derive"] }
sha2 = "0.9.5"
sha2 = "0.10.1"
tempdir = "0.3"
thiserror = "1.0"
2 changes: 1 addition & 1 deletion fortanix-vme/fortanix-vme-abi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors = ["Fortanix, Inc."]
[dependencies]
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
alloc = { version = "1.0.0", optional = true, package = "rustc-std-workspace-alloc" }
compiler_builtins = { version = "0.1.0", optional = true }
compiler_builtins = { version = "0.1.109", optional = true }
# Avoid using patch section due to https://github.com/rust-lang/cargo/issues/10031
serde = { git = "https://github.com/fortanix/serde.git", branch = "master", default-features = false, features = ["derive", "alloc"] }
vsock = { version = "0.2.4", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions fortanix-vme/fortanix-vme-runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ edition = "2018"
authors = ["Fortanix, Inc."]

[dependencies]
env_logger = "0.8.4"
env_logger = "0.9.0"
fnv = "1.0.7"
fortanix-vme-abi = { path = "../fortanix-vme-abi", features = ["std"] }
log = "0.4.14"
log = "0.4.21"
nix = "0.22.1"
serde = { version = "1.0", features = ["derive"] }
serde_cbor = { version = "0.11" }
Expand Down
2 changes: 1 addition & 1 deletion fortanix-vme/tests/iron/Cargo.toml
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"
8 changes: 4 additions & 4 deletions intel-sgx/aesm-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ sgxs = { version = "0.8.0", path = "../sgxs", optional = true }
sgx-isa = { version = "0.4.0", path = "../sgx-isa"}

# External dependencies
byteorder = "1.0" # Unlicense/MIT
byteorder = "1.5" # Unlicense/MIT
lazy_static = "1" # MIT/Apache-2.0
protobuf = "2.22.1" # MIT/Apache-2.0
protobuf = "3.4.0" # MIT/Apache-2.0
thiserror = "1.0" # MIT/Apache-2.0
anyhow = "1.0" # MIT/Apache-2.0

Expand All @@ -47,10 +47,10 @@ unix_socket2 = "0.5.4" # MIT/Apache-2.0
[target.'cfg(windows)'.dependencies]
# External dependencies
winapi = { version = "0.3.7", features = ["combaseapi", "enclaveapi", "memoryapi", "objbase"] }
libloading = "0.5.2"
libloading = "0.7.2"

[build-dependencies]
protoc-rust = "2.8.0" # MIT/Apache-2.0
protoc-rust = "2.28.0" # MIT/Apache-2.0

[dev-dependencies]
sgx-isa = { version = "0.4.0", path = "../sgx-isa" }
Expand Down
6 changes: 3 additions & 3 deletions intel-sgx/dcap-provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ crate-type = ["cdylib"]
"report-test" = { version = "0.4.0", path = "../report-test" }

# External dependencies
byteorder = "1.1.0" # Unlicense/MIT
env_logger = "0.6" # MIT/Apache-2.0
byteorder = "1.5.0" # Unlicense/MIT
env_logger = "0.9" # MIT/Apache-2.0
lazy_static = "1" # MIT/Apache-2.0
log = "0.4" # MIT/Apache-2.0
reqwest = { version = "0.11", features = ["blocking"] } # MIT/Apache-2.0
reqwest = { version = "0.12", features = ["blocking"] } # MIT/Apache-2.0
rustc-serialize = "0.3.24" # MIT/Apache-2.0
2 changes: 1 addition & 1 deletion intel-sgx/dcap-ql-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ link = []
"sgx-isa" = { version = "0.4.0", path = "../sgx-isa" }

# External dependencies
num-derive = "0.2" # MIT/Apache-2.0
num-derive = "0.3" # MIT/Apache-2.0
num-traits = "0.2" # MIT/Apache-2.0
8 changes: 4 additions & 4 deletions intel-sgx/dcap-ql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ verify = ["mbedtls", "num", "yasna"]
"sgx-isa" = { version = "0.4.0", path = "../sgx-isa" }

# External dependencies
byteorder = "1.1.0" # Unlicense/MIT
byteorder = "1.5.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 }
num = { version = "0.2", optional = true }
num-derive = "0.2" # MIT/Apache-2.0
num = { version = "0.4", optional = true }
num-derive = "0.3" # 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 }
yasna = { version = "0.4", features = ["num-bigint", "bit-vec"], optional = true }

[dev-dependencies]
mbedtls = { version = "0.12" }
Expand Down
4 changes: 2 additions & 2 deletions intel-sgx/enclave-runner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ lazy_static = "1.2.0" # MIT/Apache-2.0
libc = "0.2.48" # MIT/Apache-2.0
nix = "0.13.0" # MIT
openssl = { version = "0.10", optional = true } # Apache-2.0
crossbeam = "0.8.2" # MIT/Apache-2.0
crossbeam = "0.8.4" # MIT/Apache-2.0
num_cpus = "1.10.0" # MIT/Apache-2.0
tokio = { version = "1.35", features = ["full"] } # MIT
tokio = { version = "1.37", features = ["full"] } # MIT
futures = { version = "0.3", features = ["compat", "io-compat"] } # MIT/Apache-2.0

[features]
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/fortanix-sgx-abi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ categories = ["os"]

[dependencies]
core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }
compiler_builtins = { version = "0.1.0", optional = true }
compiler_builtins = { version = "0.1.109", optional = true }

[features]
docs = []
Expand Down
6 changes: 3 additions & 3 deletions intel-sgx/fortanix-sgx-tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ sgxs = { version = "0.8.0", path = "../sgxs" }
sgx-isa = { version = "0.4.0", path = "../sgx-isa" }

# External dependencies
xmas-elf = "0.6.0" # Apache-2.0/MIT
clap = "2.2.5" # MIT
xmas-elf = "0.9.1" # Apache-2.0/MIT
clap = "4.5.4" # 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
toml = "0.4.10" # MIT/Apache-2.0
toml = "0.8.12" # MIT/Apache-2.0
num_cpus = "1.9.0" # MIT/Apache-2.0
libc = "0.2.48" # MIT/Apache-2.0
nix = "0.13.0" # MIT
14 changes: 7 additions & 7 deletions intel-sgx/ias/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ description = "API definitions, tools, and client for the Intel Attestation Serv
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
base64 = { version = "0.13", optional = true }
bitflags = "1"
byteorder = "1.0"
base64 = { version = "0.22", optional = true }
bitflags = "2"
byteorder = "1.5"
log = "0.4"
percent-encoding = "2.1"
percent-encoding = "2.3"
serde_bytes = "0.11"
serde-bytes-repr = { version = "0.1", optional = true }
serde-bytes-repr = { version = "0.2", optional = true }
serde_json = { version = "1", optional = true }
serde = { version = "1.0.7", features = ["derive"] }
url = "2.2"
Expand All @@ -27,7 +27,7 @@ sgx-isa = { version = "0.4", path = "../sgx-isa" }
sgx_pkix = { version = "0.2", path = "../sgx_pkix" }

[target.'cfg(not(target_env="sgx"))'.dependencies]
reqwest = { version = "0.11", features = ["json"], optional = true }
reqwest = { version = "0.12", features = ["json"], optional = true }

[features]
client = ["reqwest", "base64", "serde-bytes-repr", "serde_json"]
Expand All @@ -39,7 +39,7 @@ tokio = { version = "1", features = ["macros"] }
env_logger = "0.9.0"

[target.'cfg(not(target_env="sgx"))'.dev-dependencies]
clap = "2.23.3"
clap = "4.5.4"

report-test = { version = "0.4", path = "../report-test" }
aesm-client = { version = "0.6", features = ["sgxs"], path = "../aesm-client" }
Expand Down
2 changes: 1 addition & 1 deletion intel-sgx/sgx-isa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ mbedtls = { version = "0.12", default-features = false, features = ["std"] }

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

[features]
Expand Down
4 changes: 2 additions & 2 deletions intel-sgx/sgx_pkix/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ keywords = [ "certificate-handling", "sgx" ]
categories = ["cryptography"]

[dependencies]
byteorder = "1.0"
byteorder = "1.5"
pkix = ">=0.1.1, <0.3.0"
sgx-isa = { version = "0.4", path = "../sgx-isa" }
quick-error = "1.1.0"
quick-error = "2.0.1"
lazy_static = "1"
4 changes: 2 additions & 2 deletions intel-sgx/sgxs-loaders/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ no_sgx_enclave_common = []
"sgx-isa" = { version = "0.4.0", path = "../sgx-isa" }

# External dependencies
bitflags = "1" # MIT/Apache-2.0
bitflags = "2" # MIT/Apache-2.0
nix = "0.15" # MIT
anyhow = "1.0" # MIT/Apache-2.0
thiserror = "1.0" # MIT/Apache-2.0
libloading = "0.5" # ISC
libloading = "0.7" # ISC

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.7", features = ["enclaveapi","memoryapi","processthreadsapi"] }
Expand Down
24 changes: 12 additions & 12 deletions intel-sgx/sgxs-tools/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,29 @@ path = "src/sgx_detect/main.rs"

# External dependencies
lazy_static = "1" # MIT/Apache-2.0
clap = "2.2.5" # MIT
reqwest = { version = "0.11", features = ["blocking", "json"] } # MIT/Apache-2.0
clap = "4.5.4" # MIT
reqwest = { version = "0.12", features = ["blocking", "json"] } # MIT/Apache-2.0
regex = "1" # MIT/Apache-2.0
num = "0.2" # MIT/Apache-2.0
byteorder = "1.1.0" # Unlicense/MIT
num = "0.4" # MIT/Apache-2.0
byteorder = "1.5.0" # Unlicense/MIT
openssl = "0.10" # Apache-2.0
anyhow = "1.0" # MIT/Apache-2.0
thiserror = "1.0" # MIT/Apache-2.0
crypto-hash = "0.3" # MIT
log = "0.4" # MIT/Apache-2.0
env_logger = "0.6" # MIT/Apache-2.0
yansi = "0.5" # MIT/Apache-2.0
env_logger = "0.9" # MIT/Apache-2.0
yansi = "1.0" # MIT/Apache-2.0
atty = "0.2" # MIT
quote = "0.6" # MIT/Apache-2.0
proc-macro2 = "0.4" # MIT/Apache-2.0
petgraph = "0.4" # MIT/Apache-2.0
quote = "1.0" # MIT/Apache-2.0
proc-macro2 = "1.0" # MIT/Apache-2.0
petgraph = "0.6" # MIT/Apache-2.0
mopa = "0.2" # MIT/Apache-2.0
syn = { version = "0.15", features = ["full"] } # MIT/Apache-2.0
syn = { version = "2.0", features = ["full"] } # MIT/Apache-2.0
fnv = "1" # MIT/Apache-2.0
proc-mounts = "0.2.4" # MIT
proc-mounts = "0.3.0" # MIT
serde = "1.0.84" # MIT/Apache-2.0
serde_derive = "1.0.84" # MIT/Apache-2.0
serde_yaml = "0.8.8" # MIT/Apache-2.0
serde_yaml = "0.9.34" # MIT/Apache-2.0

[target.'cfg(unix)'.dependencies]
"dcap-ql" = { version = "0.4.0", path = "../dcap-ql" }
Expand Down
6 changes: 3 additions & 3 deletions intel-sgx/sgxs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ categories = ["parsing", "encoding"]
sgx-isa = { version = "0.4.0", path = "../sgx-isa" }

# External dependencies
byteorder = "1.0" # Unlicense/MIT
byteorder = "1.5" # Unlicense/MIT
time = { version = "0.3", 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
openssl-sys = { version = "0.9.24", optional = true } # Apache-2.0
foreign-types = { version = "0.3", optional = true } # MIT/Apache-2.0
sha2 = { version = "0.8", optional = true } # MIT OR Apache-2.0
foreign-types = { version = "0.5", optional = true } # MIT/Apache-2.0
sha2 = { version = "0.10", optional = true } # MIT OR Apache-2.0

[features]
crypto-openssl = ["openssl", "openssl-sys", "foreign-types"]
Expand Down
2 changes: 1 addition & 1 deletion ipc-queue/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ static_assertions = "1.1.0"

[target.'cfg(not(target_env = "sgx"))'.dev-dependencies]
futures = { version = "0.3", features = ["compat", "io-compat"] }
tokio = { version = "1.35", features = ["full"] }
tokio = { version = "1.37", features = ["full"] }

[package.metadata.fortanix-sgx]
# set number of threads so tests can run properly
Expand Down
4 changes: 2 additions & 2 deletions rs-libc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ keywords = ["libc", "malloc", "strcmp", "snprintf"]
categories = ["external-ffi-bindings", "os"]

[build-dependencies]
cc = "1.0.46"
cc = "1.0.94"

[dependencies]
zeroize = "1.6.0"
zeroize = "1.7.0"
Loading