From ff1ce6ddfcaa00fdcdf365714a1e016d1afaf315 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 17 Aug 2024 09:43:33 -0400 Subject: [PATCH 1/5] bindgen 0.66 --- openssl-sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml index 131ebe684..3d809b546 100644 --- a/openssl-sys/Cargo.toml +++ b/openssl-sys/Cargo.toml @@ -23,7 +23,7 @@ libc = "0.2" bssl-sys = { version = "0.1.0", optional = true } [build-dependencies] -bindgen = { version = "0.65.0", optional = true, features = ["experimental"] } +bindgen = { version = "0.66.0", optional = true, features = ["experimental"] } cc = "1.0.61" openssl-src = { version = "300.2.0", optional = true, features = ["legacy"] } pkg-config = "0.3.9" From ea204f539ebd3bf88b75f4c0f6ae435dfc198f27 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 17 Aug 2024 10:03:01 -0400 Subject: [PATCH 2/5] Raise MSRV to 1.63 --- .github/workflows/ci.yml | 4 +--- openssl-errors/Cargo.toml | 1 + openssl-macros/Cargo.toml | 1 + openssl-sys/Cargo.toml | 1 + openssl/Cargo.toml | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efc975dbd..52e712a11 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: # Remember to also update `--rust-target` in `openssl-sys/build/run_bindgen.rs` - uses: sfackler/actions/rustup@master with: - version: 1.56.0 + version: 1.63.0 - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT id: rust-version - uses: actions/cache@v4 @@ -72,8 +72,6 @@ jobs: restore-keys: | index-${{ runner.os }}- - run: cargo generate-lockfile - - run: | - cargo update -p cc --precise 1.0.94 - uses: actions/cache@v4 with: path: ~/.cargo/registry/cache diff --git a/openssl-errors/Cargo.toml b/openssl-errors/Cargo.toml index 5285b266e..a95312dc3 100644 --- a/openssl-errors/Cargo.toml +++ b/openssl-errors/Cargo.toml @@ -8,6 +8,7 @@ description = "Custom error library support for the openssl crate." repository = "https://github.com/sfackler/rust-openssl" readme = "README.md" categories = ["api-bindings"] +rust-version = "1.63.0" [dependencies] cfg-if = "1.0" diff --git a/openssl-macros/Cargo.toml b/openssl-macros/Cargo.toml index 90abfdfa2..c62e29971 100644 --- a/openssl-macros/Cargo.toml +++ b/openssl-macros/Cargo.toml @@ -5,6 +5,7 @@ edition = "2018" license = "MIT OR Apache-2.0" description = "Internal macros used by the openssl crate." repository = "https://github.com/sfackler/rust-openssl" +rust-version = "1.63.0" [lib] proc-macro = true diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml index 3d809b546..0859f9573 100644 --- a/openssl-sys/Cargo.toml +++ b/openssl-sys/Cargo.toml @@ -13,6 +13,7 @@ categories = ["cryptography", "external-ffi-bindings"] links = "openssl" build = "build/main.rs" edition = "2018" +rust-version = "1.63.0" [features] vendored = ['openssl-src'] diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index cc8ef0acc..1764c9a3a 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -9,6 +9,7 @@ readme = "README.md" keywords = ["crypto", "tls", "ssl", "dtls"] categories = ["cryptography", "api-bindings"] edition = "2018" +rust-version = "1.63.0" # these are deprecated and don't do anything anymore [features] From de7d1dc232b0c05ef89f4cdbe29dc8ee0c7bf762 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 17 Aug 2024 10:13:52 -0400 Subject: [PATCH 3/5] bindgen 0.68 --- openssl-sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml index 0859f9573..357ce333f 100644 --- a/openssl-sys/Cargo.toml +++ b/openssl-sys/Cargo.toml @@ -24,7 +24,7 @@ libc = "0.2" bssl-sys = { version = "0.1.0", optional = true } [build-dependencies] -bindgen = { version = "0.66.0", optional = true, features = ["experimental"] } +bindgen = { version = "0.68.0", optional = true, features = ["experimental"] } cc = "1.0.61" openssl-src = { version = "300.2.0", optional = true, features = ["legacy"] } pkg-config = "0.3.9" From 0f8ac0f094907f2fb9ba043a53f2754667aa5e53 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 17 Aug 2024 10:23:08 -0400 Subject: [PATCH 4/5] bindgen 0.69 --- openssl-sys/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml index 357ce333f..b9fd232f0 100644 --- a/openssl-sys/Cargo.toml +++ b/openssl-sys/Cargo.toml @@ -24,7 +24,7 @@ libc = "0.2" bssl-sys = { version = "0.1.0", optional = true } [build-dependencies] -bindgen = { version = "0.68.0", optional = true, features = ["experimental"] } +bindgen = { version = "0.69.0", optional = true, features = ["experimental"] } cc = "1.0.61" openssl-src = { version = "300.2.0", optional = true, features = ["legacy"] } pkg-config = "0.3.9" From 8141d07a7382f93e0f9b433c1df97b2f8241825b Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 17 Aug 2024 10:33:14 -0400 Subject: [PATCH 5/5] Switch to 2021 edition --- openssl-errors/Cargo.toml | 2 +- openssl-macros/Cargo.toml | 2 +- openssl-sys/Cargo.toml | 2 +- openssl/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openssl-errors/Cargo.toml b/openssl-errors/Cargo.toml index a95312dc3..24f724678 100644 --- a/openssl-errors/Cargo.toml +++ b/openssl-errors/Cargo.toml @@ -2,7 +2,7 @@ name = "openssl-errors" version = "0.2.0" authors = ["Steven Fackler "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" description = "Custom error library support for the openssl crate." repository = "https://github.com/sfackler/rust-openssl" diff --git a/openssl-macros/Cargo.toml b/openssl-macros/Cargo.toml index c62e29971..40134616b 100644 --- a/openssl-macros/Cargo.toml +++ b/openssl-macros/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "openssl-macros" version = "0.1.1" -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" description = "Internal macros used by the openssl crate." repository = "https://github.com/sfackler/rust-openssl" diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml index b9fd232f0..7ec1038dc 100644 --- a/openssl-sys/Cargo.toml +++ b/openssl-sys/Cargo.toml @@ -12,7 +12,7 @@ readme = "README.md" categories = ["cryptography", "external-ffi-bindings"] links = "openssl" build = "build/main.rs" -edition = "2018" +edition = "2021" rust-version = "1.63.0" [features] diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index 1764c9a3a..85426ad32 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/sfackler/rust-openssl" readme = "README.md" keywords = ["crypto", "tls", "ssl", "dtls"] categories = ["cryptography", "api-bindings"] -edition = "2018" +edition = "2021" rust-version = "1.63.0" # these are deprecated and don't do anything anymore