diff --git a/apps/sigchat/src/manager/signal_ws.rs b/apps/sigchat/src/manager/signal_ws.rs index 92f08cfff..65b942062 100644 --- a/apps/sigchat/src/manager/signal_ws.rs +++ b/apps/sigchat/src/manager/signal_ws.rs @@ -74,9 +74,9 @@ impl SignalWS { let host = url.host_str().expect("failed to extract host from url"); match TcpStream::connect((host, 443)) { Ok(sock) => { - log::info!("tcp connected"); + log::info!("tcp connected to {host}"); let xtls = Tls::new(); - match xtls.stream(host, sock) { + match xtls.stream_owned(host, sock) { Ok(tls_stream) => { log::info!("tls configured"); log::info!("WEBSOCKET NOT IMPLEMENTED YET"); diff --git a/libs/tls/src/lib.rs b/libs/tls/src/lib.rs index ea6b549ca..642ab5850 100644 --- a/libs/tls/src/lib.rs +++ b/libs/tls/src/lib.rs @@ -11,7 +11,7 @@ use rkyv::{ ser::{serializers::WriteSerializer, Serializer}, Deserialize, }; -use rustls::{Certificate, ClientConfig, RootCertStore}; +use rustls::{Certificate, ClientConfig, ClientConnection, RootCertStore}; use sha2::Digest; use std::convert::{Into, TryFrom, TryInto}; use std::io::{Error, ErrorKind, Read, Write}; @@ -342,6 +342,16 @@ impl Tls { .with_root_certificates(self.root_store()) .with_no_client_auth() } + + pub fn stream_owned(&self, host: &str, sock: TcpStream) -> Result, Error> { + match rustls::ClientConnection::new( + Arc::new(self.client_config()), + host.try_into().expect("failed url host_str"), + ) { + Ok(conn) => Ok(rustls::StreamOwned::new(conn, sock)), + Err(_) => Err(Error::new(ErrorKind::Other, "failed to configure client connection")) + } + } } // https://stackoverflow.com/questions/57029974/how-to-split-string-into-chunks-in-rust-to-insert-spaces