Skip to content

Commit 83f8df3

Browse files
committed
fix hostname error handling in NoHostnameTlsVerifier
rustls 0.23 introduced a new variant for hostname mismatch errors
1 parent bb1fec8 commit 83f8df3

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

sqlx-core/src/net/tls/rustls.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,13 @@ impl ServerCertVerifier for NoHostnameTlsVerifier {
288288

289289
fn remove_hostname_error<O>(r: Result<O, TlsError>, ok: O) -> Result<O, TlsError> {
290290
match r {
291-
Err(TlsError::InvalidCertificate(CertificateError::NotValidForName)) => Ok(ok),
291+
Err(TlsError::InvalidCertificate(
292+
e @ (CertificateError::NotValidForNameContext { .. }
293+
| CertificateError::NotValidForName),
294+
)) => {
295+
log::debug!("Ignoring TLS certificate hostname mismatch error: {:?}", e);
296+
Ok(ok)
297+
}
292298
res => res,
293299
}
294300
}

0 commit comments

Comments
 (0)