Fix NoHostnameTlsVerifier for rustls 0.23.24 and above

elichai · elichai · commit 244b118a7862 · 2025-05-15T18:50:36.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml
@@ -39,7 +39,7 @@ tokio = { workspace = true, optional = true }
 # TLS
 native-tls = { version = "0.2.10", optional = true }
 
-rustls = { version = "0.23.15", default-features = false, features = ["std", "tls12"], optional = true }
+rustls = { version = "0.23.24", default-features = false, features = ["std", "tls12"], optional = true }
 webpki-roots = { version = "0.26", optional = true }
 rustls-native-certs = { version = "0.8.0", optional = true }
 
diff --git a/sqlx-core/src/net/tls/tls_rustls.rs b/sqlx-core/src/net/tls/tls_rustls.rs
@@ -306,9 +306,9 @@ impl ServerCertVerifier for NoHostnameTlsVerifier {
             ocsp_response,
             now,
         ) {
-            Err(TlsError::InvalidCertificate(CertificateError::NotValidForName)) => {
-                Ok(ServerCertVerified::assertion())
-            }
+            Err(TlsError::InvalidCertificate(
+                CertificateError::NotValidForName | CertificateError::NotValidForNameContext { .. },
+            )) => Ok(ServerCertVerified::assertion()),
             res => res,
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -306,9 +306,9 @@ impl ServerCertVerifier for NoHostnameTlsVerifier {`
`306`	`306`	`ocsp_response,`
`307`	`307`	`now,`
`308`	`308`	`) {`
`309`		`- Err(TlsError::InvalidCertificate(CertificateError::NotValidForName)) => {`
`310`		`- Ok(ServerCertVerified::assertion())`
`311`		`- }`
	`309`	`+ Err(TlsError::InvalidCertificate(`
	`310`	`+ CertificateError::NotValidForName \| CertificateError::NotValidForNameContext { .. },`
	`311`	`+ )) => Ok(ServerCertVerified::assertion()),`
`312`	`312`	`res => res,`
`313`	`313`	`}`
`314`	`314`	`}`