Fix Diplay panics for HandshakeError with rpk (fixes #140)

cloudflare · Aug 3, 2023 · bb063aa · bb063aa
1 parent 308f040
commit bb063aa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/boring/src/ssl/error.rs b/boring/src/ssl/error.rs
@@ -169,6 +169,12 @@ fn fmt_mid_handshake_error(
     f: &mut fmt::Formatter,
     prefix: &str,
 ) -> fmt::Result {
+    #[cfg(feature = "rpk")]
+    if s.ssl().ssl_context().is_rpk() {
+        write!(f, "{}", prefix)?;
+        return write!(f, " {}", s.error());
+    }
+
     match s.ssl().verify_result() {
         X509VerifyResult::OK => write!(f, "{}", prefix)?,
         verify => write!(f, "{}: cert verification failed - {}", prefix, verify)?,

diff --git a/tokio-boring/tests/rpk.rs b/tokio-boring/tests/rpk.rs
@@ -96,9 +96,12 @@ mod test_rpk {
 
             let stream = TcpStream::connect(&addr).await.unwrap();
 
-            assert!(tokio_boring::connect(config, "localhost", stream)
+            let err = tokio_boring::connect(config, "localhost", stream)
                 .await
-                .is_err());
+                .unwrap_err();
+
+            // NOTE: smoke test for https://github.com/cloudflare/boring/issues/140
+            let _ = err.to_string();
         };
 
         future::join(server, client).await;