diff options
| author | Steven Fackler <[email protected]> | 2017-12-26 14:20:51 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2017-12-26 14:43:10 -0700 |
| commit | 129b6b9d847692810cebee52bd7f059f19ead0d2 (patch) | |
| tree | 17a8dfeae9970c73f2ce0cdc9470a9bb56f17b0e /openssl/src/ssl/error.rs | |
| parent | Merge pull request #800 from sfackler/connector-construction (diff) | |
| download | rust-openssl-129b6b9d847692810cebee52bd7f059f19ead0d2.tar.xz rust-openssl-129b6b9d847692810cebee52bd7f059f19ead0d2.zip | |
Overhaul verify error type
Also set the error in the hostname verification callback for 1.0.1
Diffstat (limited to 'openssl/src/ssl/error.rs')
| -rw-r--r-- | openssl/src/ssl/error.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openssl/src/ssl/error.rs b/openssl/src/ssl/error.rs index 64941f18..b0641dfd 100644 --- a/openssl/src/ssl/error.rs +++ b/openssl/src/ssl/error.rs @@ -5,6 +5,7 @@ use std::io; use error::ErrorStack; use ssl::MidHandshakeSslStream; +use x509::X509VerifyResult; /// An SSL error. // FIXME this is missing variants @@ -130,8 +131,9 @@ impl<S: fmt::Debug> fmt::Display for HandshakeError<S> { HandshakeError::SetupFailure(ref e) => write!(f, ": {}", e)?, HandshakeError::Failure(ref s) | HandshakeError::WouldBlock(ref s) => { write!(f, ": {}", s.error())?; - if let Some(err) = s.ssl().verify_result() { - write!(f, ": {}", err)?; + let verify = s.ssl().verify_result(); + if verify != X509VerifyResult::OK { + write!(f, ": {}", verify)?; } } } |