Bump MSRV to 1.85 (for rustls-platform-verifier)

This also lets us take latest cargo-c in all build configurations.

Author: djc

.github/workflows/test.yaml

@@ -89,17 +89,15 @@ jobs:
       - name: Install cargo-c (Ubuntu)
         if: runner.os == 'Linux'
         env:
-          # Version picked for MSRV compat.
-          LINK: https://github.com/lu-zero/cargo-c/releases/download/v0.10.0
+          LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
           CARGO_C_FILE: cargo-c-x86_64-unknown-linux-musl.tar.gz
         run: |
           curl -L $LINK/$CARGO_C_FILE | tar xz -C ~/.cargo/bin
 
       - name: Install cargo-c (macOS)
         if: runner.os == 'macOS'
         env:
-          # Version picked for MSRV compat.
-          LINK: https://github.com/lu-zero/cargo-c/releases/download/v0.10.0
+          LINK: https://github.com/lu-zero/cargo-c/releases/latest/download
           CARGO_C_FILE: cargo-c-macos.zip
         run: |
           curl -L $LINK/$CARGO_C_FILE -o cargo-c-macos.zip
@@ -394,7 +392,7 @@ jobs:
           persist-credentials: false
 
       - name: Install rust toolchain
-        uses: dtolnay/rust-toolchain@1.73.0
+        uses: dtolnay/rust-toolchain@1.85.0
 
       - name: Test MSRV
         run: cargo check --manifest-path librustls/Cargo.toml --locked --lib --features=aws-lc-rs

librustls/Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/rustls/rustls-ffi"
 categories = ["network-programming", "cryptography"]
 edition = "2021"
 links = "rustls_ffi"
-rust-version = "1.73"
+rust-version = "1.85"
 
 [features]
 default = ["aws-lc-rs", "prefer-post-quantum"]

librustls/src/acceptor.rs

@@ -342,7 +342,7 @@ impl rustls_accepted {
     ///   - The client did not offer the ALPN extension.
     ///   - The `accepted` parameter was already transformed into a connection
     ///     with rustls_accepted_into_connection.
-    ///   
+    ///
     /// The returned value is valid until rustls_accepted_into_connection or
     /// rustls_accepted_free is called on the same `accepted`. It is not owned
     /// by the caller and does not need to be freed.
@@ -669,7 +669,7 @@ mod tests {
         let mut client_conn = null_mut();
         let result = rustls_client_config::rustls_client_connection_new(
             config,
-            "example.com\0".as_ptr() as *const c_char,
+            c"example.com".as_ptr() as *const c_char,
             &mut client_conn,
         );
         assert_eq!(result, rustls_result::Ok);

librustls/src/client.rs

@@ -916,7 +916,7 @@ mod tests {
         let mut conn = null_mut();
         let result = rustls_client_config::rustls_client_connection_new(
             config,
-            "example.com\0".as_ptr() as *const c_char,
+            c"example.com".as_ptr() as *const c_char,
             &mut conn,
         );
         if !matches!(result, rustls_result::Ok) {
@@ -969,7 +969,7 @@ mod tests {
         let mut conn = null_mut();
         let result = rustls_client_config::rustls_client_connection_new_alpn(
             config,
-            "example.com\0".as_ptr() as *const c_char,
+            c"example.com".as_ptr() as *const c_char,
             alpn_protocols.as_ptr(),
             alpn_protocols.len() as size_t,
             &mut conn,
@@ -1023,7 +1023,7 @@ mod tests {
         let mut conn = null_mut();
         let result = rustls_client_config::rustls_client_connection_new(
             config,
-            "198.51.100.198\0".as_ptr() as *const c_char,
+            c"198.51.100.198".as_ptr() as *const c_char,
             &mut conn,
         );
         if !matches!(result, rustls_result::Ok) {