chris/mumble-web-proxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update tokio-tls and native-tls to get rid of openssl:0.9 (fixes #1)

Browse source
This commit is contained in:
Jonas Herzig 2019-01-30 10:47:37 +01:00
parent 2358d2e20f
commit 8512ba4554
3 changed files with 10 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main.rs
View file

@ -19,13 +19,13 @@ use argparse::{ArgumentParser, Store};
use byteorder::{BigEndian, ByteOrder};
use bytes::{BufMut, BytesMut};
use futures::{Future, Sink, Stream};
use native_tls::TlsConnector;
use std::convert::Into;
use std::net::ToSocketAddrs;
use tokio::net::TcpStream;
use tokio::prelude::*;
use tokio_codec::Decoder;
use tokio_core::reactor::Core;
use tokio_tls::TlsConnectorExt;
use tokio_tls::TlsConnector;
use websocket::async::Server;
use websocket::message::OwnedMessage;
use websocket::server::InvalidConnection;
@ -94,12 +94,12 @@ fn main() {
.accept()
.from_err()
.join(server_sock.from_err().and_then(move |stream| {
let connector: TlsConnector = TlsConnector::builder()
.unwrap()
let connector: TlsConnector = native_tls::TlsConnector::builder()
//.danger_accept_invalid_certs(true)
.build()
.unwrap();
connector.connect_async(upstream_host, stream).from_err()
.unwrap()
.into();
connector.connect(upstream_host, stream).from_err()
}))
.and_then(move |((client, _), server)| {
let (client_sink, client_stream) = client.split();