Merge pull request #116 from lancastr/master

Ignore error in add_cert on openssl

Author: sfackler

Cargo.toml

@@ -17,13 +17,11 @@ lazy_static = "1.0"
 libc = "0.2"
 tempfile = "3.0"
 
-[target.'cfg(target_os = "android")'.dependencies]
-log = "0.4.5"
-
 [target.'cfg(target_os = "windows")'.dependencies]
 schannel = "0.1.13"
 
 [target.'cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))'.dependencies]
+log = "0.4.5"
 openssl = "0.10.15"
 openssl-sys = "0.9.30"
 openssl-probe = "0.1"

src/imp/openssl.rs

@@ -263,7 +263,9 @@ impl TlsConnector {
         supported_protocols(builder.min_protocol, builder.max_protocol, &mut connector)?;
 
         for cert in &builder.root_certificates {
-            connector.cert_store_mut().add_cert((cert.0).0.clone())?;
+            if let Err(err) = connector.cert_store_mut().add_cert((cert.0).0.clone()) {
+                debug!("add_cert error: {:?}", err);
+            }
         }
 
         #[cfg(target_os = "android")]

src/lib.rs

@@ -109,7 +109,7 @@ use std::fmt;
 use std::io;
 use std::result;
 
-#[cfg(target_os = "android")]
+#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))]
 #[macro_use]
 extern crate log;
 #[cfg(any(target_os = "macos", target_os = "ios"))]