Skip to content

Commit 20323ee

Browse files
committed
fix(bindings): Increase aws-lc-rs minimum version
1 parent 4b361d4 commit 20323ee

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.github/workflows/ci_rust.yml

+2
Original file line numberDiff line numberDiff line change
@@ -410,3 +410,5 @@ jobs:
410410
run: |
411411
cargo +${{env.RUST_NIGHTLY_TOOLCHAIN}} minimal-versions check --direct --ignore-private
412412
cargo +${{env.RUST_NIGHTLY_TOOLCHAIN}} minimal-versions check --direct --ignore-private --all-features
413+
cargo +${{env.RUST_NIGHTLY_TOOLCHAIN}} minimal-versions check --ignore-private
414+
cargo +${{env.RUST_NIGHTLY_TOOLCHAIN}} minimal-versions check --ignore-private --all-features

bindings/rust/extended/s2n-tls-sys/templates/Cargo.template

+6-5
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ stacktrace = []
3636
# unstable-foo = []
3737

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

4647
[build-dependencies]
4748
cc = { version = "1.0.100", features = ["parallel"] }

bindings/rust/extended/s2n-tls-tokio/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ default = []
1313

1414
[dependencies]
1515
errno = { version = "0.3" }
16-
# A minimum libc version of 0.2.121 is required by aws-lc-sys 0.14.0.
17-
libc = { version = "0.2.121" }
16+
# A minimum libc version of 0.2.87 is required by jobserver 0.1.30.
17+
libc = { version = "0.2.87" }
1818
pin-project-lite = { version = "0.2" }
1919
s2n-tls = { version = "=0.3.9", path = "../s2n-tls" }
2020
tokio = { version = "1", features = ["net", "time"] }

bindings/rust/extended/s2n-tls/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ unstable-testing = []
2020

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

0 commit comments

Comments
 (0)