aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-09-20 10:18:07 -0400
committerGitHub <[email protected]>2017-09-20 10:18:07 -0400
commit3c7c7a8197aeab22879f4edebb60c0e4421ee57b (patch)
treec72f0890667a24a72cbe57111ce8fdf962df36ad /openssl/src/ssl
parentUpdate to cc 1.0 (diff)
parentProperly handle IPs in hostname verification (diff)
downloadrust-openssl-0.9.18.tar.xz
rust-openssl-0.9.18.zip
Merge pull request #731 from sfackler/ip-hostv0.9.18
Properly handle IPs in hostname verification
Diffstat (limited to 'openssl/src/ssl')
-rw-r--r--openssl/src/ssl/connector.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/openssl/src/ssl/connector.rs b/openssl/src/ssl/connector.rs
index 8f568054..076f246f 100644
--- a/openssl/src/ssl/connector.rs
+++ b/openssl/src/ssl/connector.rs
@@ -355,7 +355,10 @@ fn setup_verify(ctx: &mut SslContextBuilder) {
fn setup_verify_hostname(ssl: &mut Ssl, domain: &str) -> Result<(), ErrorStack> {
let param = ssl._param_mut();
param.set_hostflags(::verify::X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
- param.set_host(domain)
+ match domain.parse() {
+ Ok(ip) => param.set_ip(ip),
+ Err(_) => param.set_host(domain),
+ }
}
#[cfg(ossl101)]