Merge remote-tracking branch 'origin/pr/102'

Author: ctz

.travis.yml

@@ -20,7 +20,8 @@ before_script:
 
 script:
   - cargo test
-  - cargo test --all-features
+  - cargo test --no-default-features --features native-tokio
+  - cargo test --no-default-features --features webpki-tokio
   - cargo test --no-default-features
   - bash -c 'if [[ "$TRAVIS_RUST_VERSION" == "$CLIPPY_RUST_VERSION" ]]; then
       cargo clippy -- -D warnings;

Cargo.toml

@@ -10,23 +10,26 @@ homepage = "https://github.com/ctz/hyper-rustls"
 repository = "https://github.com/ctz/hyper-rustls"
 
 [dependencies]
-bytes = "0.5.2"
+bytes = "0.5"
 log = "0.4.4"
-ct-logs = { version = "^0.6.0", optional = true }
+ct-logs = { version = "^0.6", optional = true }
 futures-util = "0.3.1"
 hyper = { version = "0.13.0", default-features = false }
 rustls = "0.16"
+rustls-native-certs = { version = "0.2.1", optional = true }
 tokio = "0.2.4"
 tokio-rustls = "0.12.1"
-webpki = "^0.21.0"
-rustls-native-certs = { version = "0.2.1", optional = true }
+webpki = "0.21.0"
+webpki-roots = { version = "0.19", optional = true }
 
 [dev-dependencies]
-tokio = { version = "0.2.4", features = ["io-std", "macros", "dns", "stream"] }
+tokio = { version = "0.2", features = ["io-std", "macros", "dns", "stream"] }
 
 [features]
-default = ["tokio-runtime"]
-tokio-runtime = ["hyper/runtime", "ct-logs", "rustls-native-certs"]
+default = ["native-tokio"]
+webpki-tokio = ["tokio-runtime", "webpki-roots"]
+native-tokio = ["tokio-runtime", "rustls-native-certs"]
+tokio-runtime =  ["hyper/runtime", "ct-logs"]
 
 [[example]]
 name = "client"

admin/pipelines/cargo-steps.yml

@@ -5,8 +5,8 @@ steps:
   - script: cargo test
     displayName: "cargo test (debug; default features)"
     env: { "RUST_BACKTRACE": "1" }
-  - script: cargo test --all-features
-    displayName: "cargo test (debug; all features)"
+  - script: cargo test --no-default-features --features webpki-tokio
+    displayName: "cargo test (debug; webpi-roots feature)"
     env: { "RUST_BACKTRACE": "1" }
   - script: cargo test --no-default-features
     displayName: "cargo build (debug; no default features)"

src/connector.rs

@@ -24,7 +24,7 @@ pub struct HttpsConnector<T> {
     tls_config: Arc<ClientConfig>,
 }
 
-#[cfg(feature = "tokio-runtime")]
+#[cfg(all(any(feature = "rustls-native-certs", feature = "webpki-roots"), feature = "tokio-runtime"))]
 impl HttpsConnector<HttpConnector> {
     /// Construct a new `HttpsConnector`.
     ///
@@ -34,22 +34,31 @@ impl HttpsConnector<HttpConnector> {
         http.enforce_http(false);
         let mut config = ClientConfig::new();
         config.alpn_protocols = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
-        config.root_store = match rustls_native_certs::load_native_certs() {
-            Ok(store) => store,
-            Err((Some(store), err)) => {
-                warn!("Could not load all certificates: {:?}", err);
-                store
-            }
-            Err((None, err)) => {
-                Err(err).expect("cannot access native cert store")
-            }
-        };
+        #[cfg(feature = "rustls-native-certs")] 
+        {
+            config.root_store = match rustls_native_certs::load_native_certs() {
+                Ok(store) => store,
+                Err((Some(store), err)) => {
+                    warn!("Could not load all certificates: {:?}", err);
+                    store
+                }
+                Err((None, err)) => {
+                    Err(err).expect("cannot access native cert store")
+                }
+            };
+        }
+        #[cfg(feature = "webpki-roots")] 
+        {
+            config
+                .root_store
+                .add_server_trust_anchors(&webpki_roots::TLS_SERVER_ROOTS);
+        }
         config.ct_logs = Some(&ct_logs::LOGS);
         (http, config).into()
     }
 }
 
-#[cfg(feature = "tokio-runtime")]
+#[cfg(all(any(feature = "rustls-native-certs", feature = "webpki-roots"), feature = "tokio-runtime"))]
 impl Default for HttpsConnector<HttpConnector> {
     fn default() -> Self {
         Self::new()

src/lib.rs

@@ -5,7 +5,7 @@
 //! ## Example
 //!
 //! ```no_run
-//! # #[cfg(feature = "tokio-runtime")]
+//! # #[cfg(all(any(feature = "rustls-native-certs", feature = "webpki-roots"), feature = "tokio-runtime"))]
 //! # fn main() {
 //! use hyper::{Body, Client, StatusCode, Uri};
 //!
@@ -22,6 +22,15 @@
 //! # fn main() {}
 //! ```
 
+#[cfg(all(
+    feature = "tokio-runtime",
+    any(not(feature = "rustls-native-certs"), feature = "webpki-roots"),
+    any(not(feature = "webpki-roots"), feature = "rustls-native-certs")
+))]
+compile_error!(
+    "Must enable exactly one of rustls-native-certs (default) or webpki-roots with tokio-runtime! (note: use `default-features = false' in a binary crate for one or other)"
+);
+
 mod connector;
 mod stream;