aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/ssl/error.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-12-26 15:04:26 -0700
committerGitHub <[email protected]>2017-12-26 15:04:26 -0700
commit642d5bd54d276f8fc80162ccb7e8cd4023349452 (patch)
treeade359d91e6ee0a0da8d552dd919df2860b24997 /openssl/src/ssl/error.rs
parentMerge pull request #800 from sfackler/connector-construction (diff)
parentFlag off constant (diff)
downloadrust-openssl-642d5bd54d276f8fc80162ccb7e8cd4023349452.tar.xz
rust-openssl-642d5bd54d276f8fc80162ccb7e8cd4023349452.zip
Merge pull request #801 from sfackler/verify-error
Overhaul verify error type
Diffstat (limited to 'openssl/src/ssl/error.rs')
-rw-r--r--openssl/src/ssl/error.rs6
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)?;
}
}
}