Add rustls support Take 2

.circleci/config.yml

@@ -63,15 +63,23 @@ jobs:
             RUST_BACKTRACE=1 cargo build --verbose --features ssl
             RUST_BACKTRACE=1 cargo build --examples -j 8
       - run:
-          name: Unit testing
+          name: Unit testing with ssl feature
           command: |
             RUST_BACKTRACE=1 cargo test -j 8 --verbose --features ssl
+      - run:
+          name: Unit testing with ssl-rustls feature
+          command: |
+            RUST_BACKTRACE=1 cargo test -j 8 --verbose --features ssl-rustls
       - run:
           name: More unit testing
           command: |
             docker load -i test-iostream
             docker load -i test-signal
             RUST_BACKTRACE=1 cargo test --verbose --features ssl -- --ignored
+      - run:
+          name: More unit testing with ssl-rustls
+          command: |
+            RUST_BACKTRACE=1 cargo test --verbose --features ssl-rustls -- --ignored
       - save_cache:
           key: cache-cargo-target-{{ .Environment.CIRCLE_JOB }}-{{ .Environment.CIRCLECI_CACHE_VERSION }}-{{ checksum "/tmp/build-dep" }}
           paths:

Cargo.toml

@@ -24,6 +24,7 @@ experimental = []
 
 # Enable OpenSSL both directly and for Hyper.
 ssl = ["openssl", "native-tls", "hyper-tls"]
+ssl-rustls = ["rustls", "hyper-rustls", "rustls-pemfile"]
 
 [dependencies]
 async-trait = "0.1"
@@ -34,7 +35,10 @@ futures = "0.3"
 http = "0.2"
 hyper = { version = "0.14", features = ["client", "http1", "stream", "tcp"] }
 openssl = { version = "0.10", optional = true }
+rustls = { version = "0.21", optional = true }
+rustls-pemfile = { version = "1.0.0", optional = true }
 hyper-tls = { version = "0.5", optional = true }
+hyper-rustls = { version = "0.24", optional = true, features = ["http2"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 url = "2"

src/docker.rs

@@ -282,7 +282,7 @@ impl Docker {
         .into())
     }
 
-    #[cfg(feature = "openssl")]
+    #[cfg(any(feature = "openssl", feature = "rustls"))]
     pub fn connect_with_ssl(
         addr: &str,
         key: &Path,
@@ -298,7 +298,7 @@ impl Docker {
         Ok(Docker::new(client, Protocol::Tcp))
     }
 
-    #[cfg(not(feature = "openssl"))]
+    #[cfg(not(any(feature = "openssl", feature = "rustls")))]
     pub fn connect_with_ssl(
         _addr: &str,
         _key: &Path,

src/errors.rs

@@ -37,6 +37,9 @@ pub enum Error {
     #[cfg(feature = "openssl")]
     #[error("ssl error")]
     OpenSsl(#[from] openssl::error::ErrorStack),
+    #[cfg(feature = "rustls")]
+    #[error("ssl error")]
+    Rustls(#[from] rustls::Error),
     #[error("could not connect: {}", addr)]
     CouldNotConnect { addr: String, source: Box<Error> },
     #[error("could not find DOCKER_CERT_PATH")]