Cargo: rustls .22 -> .25, webpki 0.102.8 -> 0.103

Updates rustls to 0.23.25, and webpki 0.102.8 to 0.103.

Alongside this update, we tidy our features slightly:

* The webpki "aws_lc_rs" feature is replaced with "aws-lc-rs". The
  underscore variant was an early mistake we undid with 0.103.
* The rustls-ffi "fips" feature now activates "rustls/fips" and
  "webpki/aws-lc-rs-fips". This avoids having both aws-lc-sys and
  aws-lc-fips-sys in FIPS builds.

Author: cpu

Cargo.lock

@@ -13,7 +13,7 @@ resolver = "2"
 
 [workspace.dependencies]
 rustls = { version = "0.23", default-features = false, features = ["std", "tls12"] }
-webpki = { package = "rustls-webpki", version = "0.102.0", default-features = false, features = ["std"] }
+webpki = { package = "rustls-webpki", version = "0.103", default-features = false, features = ["std"] }
 libc = "0.2"
 log = "0.4.22"
 rustls-platform-verifier = "0.5"

Cargo.toml

@@ -22,14 +22,14 @@ no_log_capture = []
 read_buf = ["rustls/read_buf"]
 capi = []
 ring = ["rustls/ring", "webpki/ring"]
-aws-lc-rs = ["rustls/aws-lc-rs", "webpki/aws_lc_rs"]
+aws-lc-rs = ["rustls/aws-lc-rs", "webpki/aws-lc-rs"]
 cert_compression = ["rustls/brotli", "rustls/zlib"]
-fips = ["aws-lc-rs", "rustls/fips"]
+fips = ["rustls/fips", "webpki/aws-lc-rs-fips"]
 prefer-post-quantum = ["aws-lc-rs", "rustls/prefer-post-quantum"]
 
 [dependencies]
 # Keep in sync with RUSTLS_CRATE_VERSION in build.rs
-rustls = { version = "0.23.22", default-features = false, features = ["std", "tls12"] }
+rustls = { version = "0.23.25", default-features = false, features = ["std", "tls12"] }
 webpki  = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }

librustls/Cargo.toml

@@ -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.22";
+const RUSTLS_CRATE_VERSION: &str = "0.23.25";
 
 fn main() {
     let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());