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

Remove wildcard versions and ensure all dependencies have a version requirement #14

Merged
merged 1 commit into from Nov 8, 2023
Merged

Remove wildcard versions and ensure all dependencies have a version requirement #14

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion mls-rs-codec/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ preallocate = []
std = ["dep:thiserror"]

[dependencies]
mls-rs-codec-derive = { version = "*", path = "../mls-rs-codec-derive" }
mls-rs-codec-derive = { version = "0.1.0", path = "../mls-rs-codec-derive" }
thiserror = { version = "1.0.40", optional = true }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion mls-rs-core/Cargo.toml
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ test_suite = ["dep:serde", "dep:serde_json", "dep:hex", "dep:itertools"]

[dependencies]
async-trait = "0.1.74"
mls-rs-codec = { version = "*", path = "../mls-rs-codec", default-features = false}
mls-rs-codec = { version = "0.4.0", path = "../mls-rs-codec", default-features = false}
zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }
arbitrary = { version = "1", features = ["derive"], optional = true }
base64 = { version = "0.21.0", default-features = false, features = ["alloc"]}
Expand Down
10 changes: 5 additions & 5 deletions mls-rs-crypto-awslc/Cargo.toml
View file
Open in desktop
Expand Up @@ -11,17 +11,17 @@ license = "Apache-2.0 OR MIT"
[dependencies]
aws-lc-rs = "1.4"
aws-lc-sys = { version = "0.11.0", features = ["bindgen"] }
mls-rs-core = { path = "../mls-rs-core", version = "*" }
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", version = "*" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", version = "*" }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", version = "*" }
mls-rs-core = { path = "../mls-rs-core", version = "0.14.0" }
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", version = "0.4.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", version = "0.6.0" }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", version = "0.7.0" }
thiserror = "1.0.40"
zeroize = { version = "1", features = ["zeroize_derive"] }
maybe-async = "0.2.7"

[dev-dependencies]
assert_matches = "1.5.0"
mls-rs-core = { path = "../mls-rs-core", version = "*", features = ["test_suite"] }
mls-rs-core = { path = "../mls-rs-core", version = "0.14.0", features = ["test_suite"] }
futures-test = "0.3.25"

[target.'cfg(mls_build_async)'.dependencies]
Expand Down
10 changes: 5 additions & 5 deletions mls-rs-crypto-hpke/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@ default = ["std"]
std = ["mls-rs-core/std", "mls-rs-crypto-traits/std", "dep:thiserror", "zeroize/std"]

[dependencies]
mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "*" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", default-features = false, version = "*" }
mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "0.14.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", default-features = false, version = "0.6.0" }
thiserror = { version = "1.0.40", optional = true }
zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }
cfg-if = "^1"
Expand All @@ -27,14 +27,14 @@ serde_json = { version = "^1.0" }
assert_matches = "1.5.0"
mockall = "0.11"
hex = { version = "^0.4.3", features = ["serde"] }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", features = ["mock"], version = "*" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", features = ["mock"], version = "0.6.0" }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
mls-rs-crypto-openssl = { path = "../mls-rs-crypto-openssl", version = "*"}
mls-rs-crypto-openssl = { path = "../mls-rs-crypto-openssl", version = "0.5.0"}

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = { version = "0.3.26", default-features = false }
mls-rs-crypto-rustcrypto = { path = "../mls-rs-crypto-rustcrypto", version = "*"}
mls-rs-crypto-rustcrypto = { path = "../mls-rs-crypto-rustcrypto", version = "0.6.0"}
getrandom = { version = "0.2", features = ["js"] }

[target.'cfg(mls_build_async)'.dependencies]
Expand Down
10 changes: 5 additions & 5 deletions mls-rs-crypto-openssl/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,10 +14,10 @@ default = ["x509"]

[dependencies]
openssl = { version = "^0.10.40" }
mls-rs-core = { path = "../mls-rs-core", version = "*" }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", optional = true, version = "*" }
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", version = "*" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", version = "*" }
mls-rs-core = { path = "../mls-rs-core", version = "0.14.0" }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", optional = true, version = "0.7.0" }
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", version = "0.4.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", version = "0.6.0" }
thiserror = "1.0.40"
enum-iterator = "1.1.2"
zeroize = { version = "1", features = ["zeroize_derive"] }
Expand All @@ -28,7 +28,7 @@ hex = { version = "^0.4.3", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "^1.0" }
assert_matches = "1.5.0"
mls-rs-core = { path = "../mls-rs-core", version = "*", features = ["test_suite"] }
mls-rs-core = { path = "../mls-rs-core", version = "0.14.0", features = ["test_suite"] }

[target.'cfg(mls_build_async)'.dependencies]
async-trait = "0.1.74"
10 changes: 5 additions & 5 deletions mls-rs-crypto-rustcrypto/Cargo.toml
View file
Open in desktop
Expand Up @@ -29,9 +29,9 @@ std = [
]

[dependencies]
mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "*" }
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", default-features = false, version = "*" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", default-features = false, version = "*" }
mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "0.14.0" }
mls-rs-crypto-hpke = { path = "../mls-rs-crypto-hpke", default-features = false, version = "0.4.0" }
mls-rs-crypto-traits = { path = "../mls-rs-crypto-traits", default-features = false, version = "0.6.0" }

thiserror = { version = "1.0.40", optional = true }
zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }
Expand Down Expand Up @@ -59,7 +59,7 @@ ed25519-dalek = { version = "2", default-features = false, features = ["alloc",
sec1 = { version = "0.7", default-features = false, features = ["alloc"] }

# X509 feature
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", optional = true, version = "*" }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", optional = true, version = "0.7.0" }
x509-cert = { version = "0.2", optional = true, features = ["std"] }
spki = { version = "0.7", optional = true, features = ["std", "alloc"] }
sha1 = { version = "0.10", optional = true, features = ["std"] }
Expand All @@ -71,7 +71,7 @@ hex = { version = "^0.4.3", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "^1.0" }
assert_matches = "1.5.0"
mls-rs-core = { path = "../mls-rs-core", version = "*", features = ["test_suite"] }
mls-rs-core = { path = "../mls-rs-core", version = "0.14.0", features = ["test_suite"] }

[target.'cfg(mls_build_async)'.dependencies]
async-trait = "0.1.74"
2 changes: 1 addition & 1 deletion mls-rs-crypto-traits/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,5 +14,5 @@ std = ["mls-rs-core/std"]
default = ["std"]

[dependencies]
mls-rs-core = { path = "../mls-rs-core", version = "*", default-features = false }
mls-rs-core = { path = "../mls-rs-core", version = "0.14.0", default-features = false }
mockall = { version = "^0.11", optional = true }
8 changes: 4 additions & 4 deletions mls-rs-ffi/Cargo.toml
View file
Open in desktop
Expand Up @@ -19,9 +19,9 @@ std = ["mls-rs/std", "safer-ffi-gen/std"]
x509 = ["mls-rs-identity-x509"]

[dependencies]
mls-rs = { path = "../mls-rs", version = "*", features = ["ffi"] }
mls-rs-crypto-openssl = { path = "../mls-rs-crypto-openssl", version = "*", optional = true }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", version = "*", optional = true }
mls-rs-provider-sqlite = { path = "../mls-rs-provider-sqlite", version = "*", default-features = false, optional = true }
mls-rs = { path = "../mls-rs", version = "0.34.0", features = ["ffi"] }
mls-rs-crypto-openssl = { path = "../mls-rs-crypto-openssl", version = "0.5.0", optional = true }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", version = "0.7.0", optional = true }
mls-rs-provider-sqlite = { path = "../mls-rs-provider-sqlite", version = "0.7.0", default-features = false, optional = true }
safer-ffi = { version = "0.1.3", default-features = false }
safer-ffi-gen = { version = "0.9.2", default-features = false }
2 changes: 1 addition & 1 deletion mls-rs-identity-x509/Cargo.toml
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ std = ["mls-rs-core/std", "dep:thiserror"]

[dependencies]
async-trait = "0.1.74"
mls-rs-core = { path = "../mls-rs-core", default-features = false, features = ["x509"], version = "*" }
mls-rs-core = { path = "../mls-rs-core", default-features = false, features = ["x509"], version = "0.14.0" }
maybe-async = "0.2.7"
thiserror = { version = "1.0.40", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion mls-rs-provider-sqlite/Cargo.toml
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ keywords = ["mls", "mls-rs"]
license = "Apache-2.0 OR MIT"

[dependencies]
mls-rs-core = { path = "../mls-rs-core", version = "*" }
mls-rs-core = { path = "../mls-rs-core", version = "0.14.0" }
thiserror = "1.0.40"
uuid = { version = "1.1", features = ["v4"] }
wasm-bindgen = { version = "0.2", optional = true }
Expand Down
18 changes: 9 additions & 9 deletions mls-rs/Cargo.toml
View file
Open in desktop
Expand Up @@ -49,10 +49,10 @@ fuzz_util = ["test_util", "default", "dep:once_cell", "dep:mls-rs-crypto-openssl


[dependencies]
mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "*" }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", default-features = false, version = "*", optional = true }
mls-rs-core = { path = "../mls-rs-core", default-features = false, version = "0.14.0" }
mls-rs-identity-x509 = { path = "../mls-rs-identity-x509", default-features = false, version = "0.7.0", optional = true }
zeroize = { version = "1", default-features = false, features = ["alloc", "zeroize_derive"] }
mls-rs-codec = { version = "*", path = "../mls-rs-codec", default-features = false}
mls-rs-codec = { version = "0.4.0", path = "../mls-rs-codec", default-features = false}
thiserror = { version = "1.0.40", optional = true }
futures = { version = "0.3.25", default-features = false, features = ["alloc"]}
itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"]}
Expand All @@ -61,13 +61,13 @@ cfg-if = "1"
async-trait = "0.1.74"
debug_tree = { version = "0.4.0", optional = true }
spin = { version = "0.9.8", default-features = false, features = ["mutex", "spin_mutex", "portable_atomic"]}
portable-atomic = { version = "*", default-features = false, features = ["critical-section"]}
portable-atomic = { version = "1.5.1", default-features = false, features = ["critical-section"]}
portable-atomic-util = { version = "0.1.2", default-features = false, features = ["alloc"]}
maybe-async = { version = "0.2.7" }

# Optional dependencies
mls-rs-provider-sqlite = { path = "../mls-rs-provider-sqlite", version = "*", default-features = false, optional = true }
mls-rs-crypto-openssl = { path = "../mls-rs-crypto-openssl", optional = true, version = "*" }
mls-rs-provider-sqlite = { path = "../mls-rs-provider-sqlite", version = "0.7.0", default-features = false, optional = true }
mls-rs-crypto-openssl = { path = "../mls-rs-crypto-openssl", optional = true, version = "0.5.0" }
# TODO: https://github.com/GoogleChromeLabs/wasm-bindgen-rayon
rayon = { version = "1", optional = true }
arbitrary = { version = "1", features = ["derive"], optional = true }
Expand All @@ -88,19 +88,19 @@ wasm-bindgen = { version = "^0.2.79" }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen-test = { version = "0.3.26", default-features = false }
mls-rs-crypto-rustcrypto = { path = "../mls-rs-crypto-rustcrypto", features = ["browser"], version = "*" }
mls-rs-crypto-rustcrypto = { path = "../mls-rs-crypto-rustcrypto", features = ["browser"], version = "0.6.0" }
criterion = { version = "0.5.1", default-features = false, features = ["plotters", "cargo_bench_support", "async_futures", "html_reports"] }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
mls-rs-crypto-openssl = { path = "../mls-rs-crypto-openssl", version = "*"}
mls-rs-crypto-openssl = { path = "../mls-rs-crypto-openssl", version = "0.5.0"}
criterion = { version = "0.5.1", features = ["async_futures", "html_reports"] }

# Benchmark crypto engine swaps
[target.'cfg(awslc)'.dependencies]
mls-rs-crypto-awslc = { path = "../mls-rs-crypto-awslc" }

[target.'cfg(rustcrypto)'.dependencies]
mls-rs-crypto-rustcrypto = { path = "../mls-rs-crypto-rustcrypto" }
mls-rs-crypto-rustcrypto = { path = "../mls-rs-crypto-rustcrypto", version = "0.6.0" }


[[example]]
Expand Down
2 changes: 1 addition & 1 deletion mls-rs/fuzz/Cargo.toml
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
cargo-fuzz = true

[dependencies]
mls-rs = { path = "..", features = ["arbitrary", "fuzz_util"] }
mls-rs = { version = "0.34.0", path = "..", features = ["arbitrary", "fuzz_util"] }
futures = "0.3.25"
libfuzzer-sys = "0.4"
once_cell = "1.13.0"
Expand Down
6 changes: 3 additions & 3 deletions mls-rs/test_harness_integration/Cargo.toml
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
publish = false

[dependencies]
mls-rs = { path = "..", default-features = false, features = ["std", "external_client", "state_update"]}
mls-rs = { version = "0.34.0", path = "..", default-features = false, features = ["std", "external_client", "state_update"]}
tonic = "0.7"
prost = "0.10"
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
Expand All @@ -26,10 +26,10 @@ by_ref_proposal = [ "mls-rs/by_ref_proposal" ]
default = ["tree_index", "private_message", "prior_epoch", "out_of_order", "psk", "custom_proposal", "by_ref_proposal"]

[target.'cfg(target_arch = "wasm32")'.dependencies]
mls-rs-crypto-rustcrypto = { path = "../../mls-rs-crypto-rustcrypto", features = ["browser"], version = "*" }
mls-rs-crypto-rustcrypto = { path = "../../mls-rs-crypto-rustcrypto", features = ["browser"], version = "0.6.0" }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
mls-rs-crypto-openssl = { path = "../../mls-rs-crypto-openssl", version = "*"}
mls-rs-crypto-openssl = { path = "../../mls-rs-crypto-openssl", version = "0.5.0"}

[build-dependencies]
tonic-build = "0.7"