Make openssl optional (#118)

* Bump dependencies (#112)

* aws-region 0.22.0

* aws-creds 0.24.0

* s3 0.24.0

* Make openssl optional (#114)

* Make openssl optional

* Fix build

* Change default to native-tls

* Make openssl optional

* Remove openssl as default dep for s3

Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com>
Co-authored-by: Koplas <54645365+koplas@users.noreply.github.com>

Author: 3 people

aws-creds/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aws-creds"
-version = "0.24.0"
+version = "0.24.1"
 authors = ["Drazen Urch"]
 description = "Tiny Rust library for working with Amazon IAM credential,s, supports `s3` crate"
 repository = "https://github.com/durch/rust-s3"
@@ -18,8 +18,14 @@ path = "src/lib.rs"
 simpl = "0.1.0"
 dirs = "3"
 rust-ini = "0.15"
-attohttpc = {version = "0.15", features = ["json"]}
+attohttpc = { version = "0.15", default-features = false, features = ["json"] }
 url = "2"
 serde-xml-rs = "0.4"
 serde = "1"
 serde_derive = "1"
+
+
+[features]
+default = ["native-tls"]
+native-tls = ["attohttpc/tls"]
+rustls-tls = ["attohttpc/tls-rustls"]

s3/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rust-s3"
-version = "0.24.0"
+version = "0.24.1"
 authors = ["Drazen Urch"]
 description = "Tiny Rust library for working with Amazon S3 and compatible object storage APIs"
 repository = "https://github.com/durch/rust-s3"
@@ -23,7 +23,7 @@ base64 = "0.12"
 chrono = "0.4"
 hex = "0.4"
 hmac = "0.9"
-reqwest = {version = "0.10", features = ["json", "stream"]}
+reqwest = {version = "0.10", default-features = false, features = ["json", "stream"]}
 serde_derive = "1"
 serde = "1"
 serde-xml-rs = "0.4"
@@ -35,19 +35,20 @@ tokio = {version="0.2", features=["macros", "io-util", "stream"]}
 rand = "0.7"
 simpl = "0.1.0"
 aws-region = "0.22"
-aws-creds = "0.24"
+aws-creds = { version="0.24.1", default-features = false }
 log = "0.4"
 percent-encoding = "2"
 async-std = "1"
 http = "0.2"
+cfg-if = "0.1"
 
 
 [features]
 default = ["native-tls"]
 no-verify-ssl = []
 fail-on-err = []
-native-tls = ["reqwest/native-tls"]
-rustls-tls = ["reqwest/rustls-tls"]
+native-tls = ["reqwest/native-tls", "aws-creds/native-tls"]
+rustls-tls = ["reqwest/rustls-tls", "aws-creds/rustls-tls"]
 
 [dev-dependencies]
 tokio = {version="0.2", features=["fs"]}

s3/src/request.rs

@@ -493,10 +493,17 @@ impl<'a> Request<'a> {
         };
 
         let client = if cfg!(feature = "no-verify-ssl") {
-            Client::builder()
-                .danger_accept_invalid_certs(true)
-                .danger_accept_invalid_hostnames(true)
-                .build()
+            let client = Client::builder().danger_accept_invalid_certs(true);
+
+                cfg_if::cfg_if! {
+                    if #[cfg(feature = "native-tls")]
+                    {
+                        let client = client.danger_accept_invalid_hostnames(true);
+                    }
+
+                }
+
+                client.build()
                 .expect("Could not build dangerous client!")
         } else {
             Client::new()