Ready for publish

Author: skade

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "async-tls"
-version = "0.1.0-alpha.0"
-authors = ["Florian Gilcher <[email protected]>", "dignifiedquire <[email protected]>", "quininer kel <[email protected]>"]
+version = "0.5.0"
+authors = ["The async-rs developers", "Florian Gilcher <[email protected]>", "dignifiedquire <[email protected]>", "quininer kel <[email protected]>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/async-std/async-tls"
 homepage = "https://github.com/async-std/async-tls"
@@ -16,7 +16,7 @@ travis-ci = { repository = "async-std/async-tls" }
 appveyor = { repository = "async-std/async-tls" }
 
 [dependencies]
-futures-preview = "0.3.0-alpha.17"
+futures-preview = "0.3.0-alpha.19"
 rustls = "0.16"
 webpki = "0.21"
 webpki-roots = "0.17"

examples/client/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "client"
-version = "0.1.0"
-authors = ["quininer <[email protected]>"]
+version = "0.5.0"
+authors = ["The async-rs authors", "quininer <[email protected]>"]
 edition = "2018"
 
 [dependencies]

examples/client/src/main.rs

@@ -1,16 +1,16 @@
-#![feature(async_await)]
-
 use async_std::io;
 use async_std::io::Write;
 use async_std::net::TcpStream;
 use async_std::task;
 use async_tls::TlsConnector;
+
 use rustls::ClientConfig;
-use std::sync::Arc;
-use std::fs::File;
-use std::io::BufReader;
+
+use std::io::Cursor;
 use std::net::ToSocketAddrs;
 use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
 use structopt::StructOpt;
 
 #[derive(StructOpt)]
@@ -48,15 +48,17 @@ fn main() -> io::Result<()> {
     // Create a bare bones HTTP GET request
     let http_request = format!("GET / HTTP/1.0\r\nHost: {}\r\n\r\n", domain);
 
-    // Create default connector comes preconfigured with all you need to safely connect
-    // to remote servers!
-    let connector = if let Some(cafile) = &options.cafile {
-        connector_for_ca_file(cafile)?
-    } else {
-        TlsConnector::default()
-    };
+    let cafile = &options.cafile;
+
+    task::block_on(async move {
+        // Create default connector comes preconfigured with all you need to safely connect
+        // to remote servers!
+        let connector = if let Some(cafile) = cafile {
+            connector_for_ca_file(cafile).await?
+        } else {
+            TlsConnector::default()
+        };
 
-    task::block_on(async {
         // Open a normal TCP connection, just as you are used to
         let tcp_stream = TcpStream::connect(&addr).await?;
 
@@ -81,12 +83,13 @@ fn main() -> io::Result<()> {
     })
 }
 
-fn connector_for_ca_file(cafile: &Path) -> io::Result<TlsConnector> {
+async fn connector_for_ca_file(cafile: &Path) -> io::Result<TlsConnector> {
     let mut config = ClientConfig::new();
-    let mut pem = BufReader::new(File::open(cafile)?);
+    let file = async_std::fs::read(cafile).await?;
+    let mut pem = Cursor::new(file);
     config
         .root_store
         .add_pem_file(&mut pem)
         .map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "invalid cert"))?;
     Ok(TlsConnector::from(Arc::new(config)))
-}
+}

examples/server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "server"
-version = "0.1.0"
-authors = ["quininer <[email protected]>"]
+version = "0.5.0"
+authors = ["The async-rs developers", "quininer <[email protected]>"]
 edition = "2018"
 
 [dependencies]

examples/server/src/main.rs

@@ -1,5 +1,3 @@
-#![feature(async_await)]
-
 use async_std::io;
 use async_std::io::Write;
 use async_std::net::{TcpListener, TcpStream};

src/lib.rs

@@ -1,6 +1,5 @@
-//! Asynchronous TLS/SSL streams for async-std and AsyncRead/AsyncWrite sockets using [rustlsz](https://github.com/ctz/rustls).
+//! Asynchronous TLS/SSL streams for async-std and AsyncRead/AsyncWrite sockets using [rustls](https://github.com/ctz/rustls).
 
-#![feature(async_await)]
 #![deny(unsafe_code)]
 
 pub mod client;
@@ -11,4 +10,4 @@ mod connector;
 mod acceptor;
 
 pub use acceptor::TlsAcceptor as TlsAcceptor;
-pub use connector::TlsConnector as TlsConnector;
+pub use connector::TlsConnector as TlsConnector;

src/rusttls/stream.rs

@@ -258,4 +258,5 @@ impl<'a, IO: AsyncRead + AsyncWrite + Unpin, S: Session> AsyncWrite for Stream<'
 }
 
 #[cfg(test)]
+#[path="test_stream.rs"]
 mod test_stream;

tests/google.rs

@@ -1,5 +1,3 @@
-#![feature(async_await)]
-
 use async_std::net::TcpStream;
 use async_std::task;
 use async_tls::TlsConnector;

tests/test.rs

@@ -1,5 +1,3 @@
-#![feature(async_await)]
-
 use async_std::net::{TcpListener, TcpStream};
 use async_tls::{TlsAcceptor, TlsConnector};
 use futures::executor;