Skip to content

Commit

Permalink
fix(bindings): Increase aws-lc-rs minimum version
Browse files Browse the repository at this point in the history
  • Loading branch information
goatgoose committed Jan 17, 2025
1 parent 4b361d4 commit 20323ee
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -410,3 +410,5 @@ jobs:
run: |
cargo +${{env.RUST_NIGHTLY_TOOLCHAIN}} minimal-versions check --direct --ignore-private
cargo +${{env.RUST_NIGHTLY_TOOLCHAIN}} minimal-versions check --direct --ignore-private --all-features
cargo +${{env.RUST_NIGHTLY_TOOLCHAIN}} minimal-versions check --ignore-private
cargo +${{env.RUST_NIGHTLY_TOOLCHAIN}} minimal-versions check --ignore-private --all-features
11 changes: 6 additions & 5 deletions bindings/rust/extended/s2n-tls-sys/templates/Cargo.template
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@ stacktrace = []
# unstable-foo = []

[dependencies]
# aws-lc-rs 1.6.4 adds DEP_AWS_LC environment variables which are required to build s2n-tls-sys:
# aws-lc-rs 1.12.0 specifies a minimum version for aws-lc-sys and aws-lc-fips-sys that include
# DEP_AWS_LC environment variables, which are required to build s2n-tls-sys:
# https://github.com/aws/aws-lc-rs/pull/335
aws-lc-rs = { version = "1.6.4" }
# aws-lc-rs 1.6.4 depends on aws-lc-sys 0.14.0, which requires libc 0.2.121:
# https://github.com/aws/aws-lc-rs/blob/2298ca861234d4f43aecef2c7d7e822c60bc488a/aws-lc-sys/Cargo.toml#L65
libc = "0.2.121"
aws-lc-rs = { version = "1.12.0" }
# cc 1.0.100 depends on jobserver 0.1.30, which requires libc 0.2.87:
# https://github.com/rust-lang/jobserver-rs/blob/4ac8212169e06f427ccd4da985cf023a483fc6a6/Cargo.toml#L16
libc = "0.2.87"

[build-dependencies]
cc = { version = "1.0.100", features = ["parallel"] }
Expand Down
4 changes: 2 additions & 2 deletions bindings/rust/extended/s2n-tls-tokio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ default = []

[dependencies]
errno = { version = "0.3" }
# A minimum libc version of 0.2.121 is required by aws-lc-sys 0.14.0.
libc = { version = "0.2.121" }
# A minimum libc version of 0.2.87 is required by jobserver 0.1.30.
libc = { version = "0.2.87" }
pin-project-lite = { version = "0.2" }
s2n-tls = { version = "=0.3.9", path = "../s2n-tls" }
tokio = { version = "1", features = ["net", "time"] }
Expand Down
4 changes: 2 additions & 2 deletions bindings/rust/extended/s2n-tls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ unstable-testing = []

[dependencies]
errno = { version = "0.3" }
# A minimum libc version of 0.2.121 is required by aws-lc-sys 0.14.0.
libc = "0.2.121"
# A minimum libc version of 0.2.87 is required by jobserver 0.1.30.
libc = { version = "0.2.87" }
s2n-tls-sys = { version = "=0.3.9", path = "../s2n-tls-sys", features = ["internal"] }
pin-project-lite = "0.2"
hex = "0.4"
Expand Down

0 comments on commit 20323ee

Please sign in to comment.