Upgrade websocket to 0.26

This update contains a security fix (RUSTSEC-2022-0035).

Author: threema-danilo

Cargo.toml

@@ -30,7 +30,7 @@ rmpv = { version = "0.4", features = ["with-serde"] }
 serde = { version = "1", features = ["derive"] }
 tokio-core = "0.1"
 tokio-timer = "0.1"
-websocket = { version = "0.21", default-features = false, features = ["async", "async-ssl"] }
+websocket = { version = "0.26", default-features = false, features = ["async", "async-ssl"] }
 xsalsa20poly1305 = "0.8"
 
 [dev-dependencies]

examples/chat/main.rs

@@ -279,14 +279,9 @@ fn main() {
     let salty_arc = Arc::new(RwLock::new(salty));
 
     // Connect to server
-    let (connect_future, event_channel) = saltyrtc_client::connect(
-        "localhost",
-        8765,
-        Some(tls_connector),
-        &core.handle(),
-        salty_arc.clone(),
-    )
-    .unwrap();
+    let (connect_future, event_channel) =
+        saltyrtc_client::connect("localhost", 8765, Some(tls_connector), salty_arc.clone())
+            .unwrap();
 
     // Do handshake
     let event_tx = event_channel.clone_tx();

src/lib.rs

@@ -76,9 +76,8 @@ use futures::sync::oneshot;
 use futures::{stream, Future, Sink, Stream};
 use native_tls::TlsConnector;
 use rmpv::Value;
-use tokio_core::net::TcpStream;
-use tokio_core::reactor::Handle;
 use tokio_timer::Timer;
+use websocket::r#async::TcpStream;
 use websocket::client::builder::Url;
 use websocket::client::r#async::{Client, TlsStream};
 use websocket::client::ClientBuilder;
@@ -416,7 +415,6 @@ pub fn connect(
     host: &str,
     port: u16,
     tls_config: Option<TlsConnector>,
-    handle: &Handle,
     salty: Arc<RwLock<SaltyClient>>,
 ) -> SaltyResult<(
     impl Future<Item = WsClient, Error = SaltyError>,
@@ -437,7 +435,7 @@ pub fn connect(
     let server = format!("{}:{}", host, port);
     let future = ClientBuilder::from_url(&ws_url)
         .add_protocol(SUBPROTOCOL)
-        .async_connect_secure(tls_config, handle)
+        .async_connect_secure(tls_config)
         .map_err(move |e: WebSocketError| {
             SaltyError::Network(match e.cause() {
                 Some(cause) => {

tests/integration.rs

@@ -106,12 +106,11 @@ fn connect_to(
 
     // Reactor
     let mut core = Core::new().unwrap();
-    let handle = core.handle();
 
     // Connect
     let timeout = Duration::from_millis(1000);
     let (connect_future, event_channel) =
-        saltyrtc_client::connect(host, port, tls_connector, &handle, salty.clone()).unwrap();
+        saltyrtc_client::connect(host, port, tls_connector, salty.clone()).unwrap();
     let future = connect_future.and_then(|client| {
         saltyrtc_client::do_handshake(client, salty, event_channel.clone_tx(), Some(timeout))
     });