lib/ureq
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes after feedback

Browse Source
This commit is contained in:
Martin Algesten
2022-05-01 08:33:47 +02:00
parent 65371c966c
commit 049b5a5acd
6 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/rtls.rs
View File

@@ -1,4 +1,5 @@
use std::convert::TryFrom;
use std::fmt;
use std::io::{self, Read, Write};
use std::net::TcpStream;
use std::sync::Arc;
@@ -26,7 +27,7 @@ fn is_close_notify(e: &std::io::Error) -> bool {
false
}
struct RustlsStream(rustls::StreamOwned<rustls::ClientConnection, Box<dyn ReadWrite>>);
struct RustlsStream(rustls::StreamOwned<rustls::ClientConnection, Box<dyn ReadWrite + Sync>>);
impl ReadWrite for RustlsStream {
fn socket(&self) -> Option<&TcpStream> {
@@ -96,7 +97,7 @@ impl TlsConnector for Arc<rustls::ClientConfig> {
fn connect(
&self,
dns_name: &str,
mut io: Box<dyn ReadWrite>,
mut io: Box<dyn ReadWrite + Sync>,
) -> Result<Box<dyn ReadWrite>, Error> {
let sni = rustls::ServerName::try_from(dns_name)
.map_err(|e| ErrorKind::Dns.msg(format!("parsing '{}'", dns_name)).src(e))?;
@@ -125,3 +126,9 @@ pub fn default_tls_config() -> Arc<dyn TlsConnector> {
});
TLS_CONF.clone()
}
impl fmt::Debug for RustlsStream {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_tuple("RustlsStream").finish()
}
}