From 129b6b9d847692810cebee52bd7f059f19ead0d2 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Tue, 26 Dec 2017 14:20:51 -0700
Subject: Overhaul verify error type

Also set the error in the hostname verification callback for 1.0.1
---
 openssl/src/ssl/error.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'openssl/src/ssl/error.rs')

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)?;
                 }
             }
         }
-- 
cgit v1.2.3