min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Ivan Nikulin 2023-08-03 14:28:00 +01:00 committed by Ivan Nikulin
parent 308f0405bd
commit bb063aa9e6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boring/src/ssl/error.rs
View File

@ -169,6 +169,12 @@ fn fmt_mid_handshake_error(
f: &mut fmt::Formatter, f: &mut fmt::Formatter,
prefix: &str, prefix: &str,
) -> fmt::Result { ) -> 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() { match s.ssl().verify_result() {
X509VerifyResult::OK => write!(f, "{}", prefix)?, X509VerifyResult::OK => write!(f, "{}", prefix)?,
verify => write!(f, "{}: cert verification failed - {}", prefix, verify)?, verify => write!(f, "{}: cert verification failed - {}", prefix, verify)?,

7
tokio-boring/tests/rpk.rs
View File

@ -96,9 +96,12 @@ mod test_rpk {
let stream = TcpStream::connect(&addr).await.unwrap(); let stream = TcpStream::connect(&addr).await.unwrap();
assert!(tokio_boring::connect(config, "localhost", stream) let err = tokio_boring::connect(config, "localhost", stream)
.await .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; future::join(server, client).await;