From 4353e4f8f3cb656d38883b88f06ecae4543131fa Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@nox.paris>
Date: Mon, 15 Mar 2021 11:30:40 +0100
Subject: [PATCH] Use Display for ssl::Error in Display for ssl::HandshakeError

---
 boring/src/error.rs     |  2 +-
 boring/src/ssl/error.rs | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/boring/src/error.rs b/boring/src/error.rs
index 0bd71e14..8ffc0651 100644
--- a/boring/src/error.rs
+++ b/boring/src/error.rs
@@ -60,7 +60,7 @@ impl ErrorStack {
 impl fmt::Display for ErrorStack {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         if self.0.is_empty() {
-            return fmt.write_str("unknown OpenSSL error");
+            return fmt.write_str("unknown BoringSSL error");
         }
 
         let mut first = true;
diff --git a/boring/src/ssl/error.rs b/boring/src/ssl/error.rs
index bd771de6..cfc32489 100644
--- a/boring/src/ssl/error.rs
+++ b/boring/src/ssl/error.rs
@@ -110,7 +110,7 @@ impl fmt::Display for Error {
             },
             ErrorCode::SSL => match self.ssl_error() {
                 Some(e) => write!(fmt, "{}", e),
-                None => fmt.write_str("OpenSSL error"),
+                None => fmt.write_str("unknown BoringSSL error"),
             },
             ErrorCode(code) => write!(fmt, "unknown error code {}", code),
         }
@@ -174,15 +174,7 @@ fn fmt_mid_handshake_error(
         verify => write!(f, "{}: cert verification failed - {}", prefix, verify)?,
     }
 
-    if let Some(error) = s.error().io_error() {
-        return write!(f, " ({})", error);
-    }
-
-    if let Some(error) = s.error().ssl_error() {
-        write!(f, " {}", error)?;
-    }
-
-    Ok(())
+    write!(f, " {}", s.error())
 }
 
 impl<S> From<ErrorStack> for HandshakeError<S> {