From f9250bab5760f16392c8ff9ed6cb55bfc4d81a12 Mon Sep 17 00:00:00 2001
From: Daniel McCarney <daniel@binaryparadox.net>
Date: Fri, 22 Nov 2024 13:41:59 -0500
Subject: [PATCH 1/2] update MSRV 1.64 -> 1.71

This matches upstream rustls.
---
 .github/workflows/test.yaml | 2 +-
 Cargo.toml                  | 2 +-
 README.md                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 9c499ae6..995db271 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -25,7 +25,7 @@ jobs:
           - nightly
           # MSRV - keep in sync with what rustls and rustls-platform-verifier
           # consider MSRV
-          - 1.64.0
+          - 1.71.0
         os: [ ubuntu-latest ]
         # but only stable, clang, and aws-lc-rs on macos (slower platform)
         include:
diff --git a/Cargo.toml b/Cargo.toml
index f2b0cdbd..e89f3608 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ repository = "https://github.com/rustls/rustls-ffi"
 categories = ["network-programming", "cryptography"]
 edition = "2021"
 links = "rustls_ffi"
-rust-version = "1.64"
+rust-version = "1.71"
 
 [features]
 default = ["aws-lc-rs"]
diff --git a/README.md b/README.md
index c96dce3f..4bd51ea7 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ to provide the cryptographic primitives.
 
 # Build
 
-You'll need to [install the Rust toolchain](https://rustup.rs/) (version 1.64
+You'll need to [install the Rust toolchain](https://rustup.rs/) (version 1.71
 or above) and a C compiler (`gcc` and `clang` should both work).
 
 ## Cryptography provider

From 041726773aa20c88878496bcdd0f00d505f0cfef Mon Sep 17 00:00:00 2001
From: Daniel McCarney <daniel@binaryparadox.net>
Date: Fri, 22 Nov 2024 14:13:05 -0500
Subject: [PATCH 2/2] rustls 0.23.18, 0.14.1 changelog update

* Updates main to rustls 0.23.18 for the acceptor API fix, like the
  rel-0.14 release branch.
* Backports the rel-0.14 release notes for 0.14.1 to the main changelog.
* Sets main's version as 0.15 in preparation for a release in the future
  when ready.
---
 CHANGELOG.md | 11 +++++++++++
 Cargo.lock   | 10 +++++-----
 Cargo.toml   |  4 ++--
 build.rs     |  2 +-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77c76512..05a23184 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.14.1 (2024-11-22)
+
+This release updates to [Rustls 0.23.18][] and increases the project MSRV from
+1.64 to 1.71, matching the upstream Rustls MSRV.
+
+Notably this brings in a fix for an availability issue for **servers** using
+the `rustls_acceptor` type and associated APIs. See the upstream 0.23.18
+release notes for more information.
+
+[Rustls 0.23.18]: https://github.com/rustls/rustls/releases/tag/v%2F0.23.18
+
 ## 0.14.0 (2024-09-12)
 
 This release updates to [Rustls 0.23.13][] and changes the rustls-ffi API to allow
diff --git a/Cargo.lock b/Cargo.lock
index 6ac711c1..cfe58966 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -523,9 +523,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.16"
+version = "0.23.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
+checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f"
 dependencies = [
  "aws-lc-rs",
  "brotli",
@@ -542,7 +542,7 @@ dependencies = [
 
 [[package]]
 name = "rustls-ffi"
-version = "0.14.0"
+version = "0.15.0"
 dependencies = [
  "libc",
  "log",
@@ -1001,6 +1001,6 @@ checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 
 [[package]]
 name = "zlib-rs"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bf919c619da9eaede02291295e9c5ae230fc7b5f2a5f4257ff859b075111faf"
+checksum = "2ca4a9dc6566c9224cc161dedc5577bd81f4a9ee0f9fbe80592756d096b07ee5"
diff --git a/Cargo.toml b/Cargo.toml
index e89f3608..1d986774 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustls-ffi"
-version = "0.14.0"
+version = "0.15.0"
 license = "Apache-2.0 OR ISC OR MIT"
 readme = "README-crates.io.md"
 description = "Rustls bindings for non-Rust languages"
@@ -27,7 +27,7 @@ cert_compression = ["rustls/brotli", "rustls/zlib"]
 
 [dependencies]
 # Keep in sync with RUSTLS_CRATE_VERSION in build.rs
-rustls = { version = "0.23.16", default-features = false, features = ["std", "tls12"] }
+rustls = { version = "0.23.18", default-features = false, features = ["std", "tls12"] }
 pki-types = { package = "rustls-pki-types", version = "1.10", features = ["std"] }
 webpki = { package = "rustls-webpki", version = "0.102.0", default-features = false, features = ["std"] }
 libc = "0.2"
diff --git a/build.rs b/build.rs
index 5ccf2510..4e408180 100644
--- a/build.rs
+++ b/build.rs
@@ -8,7 +8,7 @@ use std::{env, fs, path::PathBuf};
 // because doing so would require a heavy-weight deserialization lib dependency
 // (and it couldn't be a _dev_ dep for use in a build script) or doing brittle
 // by-hand parsing.
-const RUSTLS_CRATE_VERSION: &str = "0.23.16";
+const RUSTLS_CRATE_VERSION: &str = "0.23.18";
 
 fn main() {
     let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());