librustls: rustls 0.23.28 -> 0.23.29

Notably this update marked a couple error enum variants deprecated while
introducing richer context variants. We don't have a nice way to expose
additional error context at this time and so make the minimum required
changes to avoid the deprecation warnings.

Author: cpu

Cargo.lock

@@ -30,7 +30,7 @@ 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.28", default-features = false, features = ["std", "tls12"] }
+rustls = { version = "0.23.29", 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.28";
+const RUSTLS_CRATE_VERSION: &str = "0.23.29";
 
 fn main() {
     let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());

librustls/build.rs

@@ -344,7 +344,7 @@ impl Display for rustls_result {
             CertUnknownIssuer => Error::InvalidCertificate(CertificateError::UnknownIssuer).fmt(f),
             CertBadSignature => Error::InvalidCertificate(CertificateError::BadSignature).fmt(f),
             CertUnsupportedSignatureAlgorithm => {
-                Error::InvalidCertificate(CertificateError::UnsupportedSignatureAlgorithm).fmt(f)
+                write!(f, "unsupported certificate signature algorithm")
             }
             CertNotValidForName => {
                 Error::InvalidCertificate(CertificateError::NotValidForName).fmt(f)
@@ -492,10 +492,9 @@ impl Display for rustls_result {
             CertRevocationListBadSignature => {
                 Error::InvalidCertRevocationList(CertRevocationListError::BadSignature).fmt(f)
             }
-            CertRevocationListUnsupportedSignatureAlgorithm => Error::InvalidCertRevocationList(
-                CertRevocationListError::UnsupportedSignatureAlgorithm,
-            )
-            .fmt(f),
+            CertRevocationListUnsupportedSignatureAlgorithm => {
+                write!(f, "unsupported CRL signature algorithm")
+            }
             CertRevocationListInvalidCrlNumber => {
                 Error::InvalidCertRevocationList(CertRevocationListError::InvalidCrlNumber).fmt(f)
             }
@@ -684,7 +683,7 @@ fn map_crl_error(err: CertRevocationListError) -> rustls_result {
 
     match err {
         CertRevocationListError::BadSignature => CertRevocationListBadSignature,
-        CertRevocationListError::UnsupportedSignatureAlgorithm => {
+        CertRevocationListError::UnsupportedSignatureAlgorithmContext { .. } => {
             CertRevocationListUnsupportedSignatureAlgorithm
         }
         CertRevocationListError::InvalidCrlNumber => CertRevocationListInvalidCrlNumber,
@@ -752,7 +751,9 @@ fn map_invalid_certificate_error(err: CertificateError) -> rustls_result {
         CertificateError::ExpiredRevocationList
         | CertificateError::ExpiredRevocationListContext { .. } => CertExpiredRevocationList,
         CertificateError::BadSignature => CertBadSignature,
-        CertificateError::UnsupportedSignatureAlgorithm => CertUnsupportedSignatureAlgorithm,
+        CertificateError::UnsupportedSignatureAlgorithmContext { .. } => {
+            CertUnsupportedSignatureAlgorithm
+        }
         CertificateError::NotValidForName | CertificateError::NotValidForNameContext { .. } => {
             CertNotValidForName
         }