Merge pull request #109 from edelangh/android_add_cert_error

Android add certs error: already in hash table

Author: sfackler

Cargo.toml

@@ -17,6 +17,9 @@ 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"
 

src/imp/openssl.rs

@@ -102,7 +102,9 @@ fn load_android_root_certs(connector: &mut SslContextBuilder) -> Result<(), Erro
             .filter_map(|e| fs::read(e.path()).ok())
             .filter_map(|b| X509::from_pem(&b).ok());
         for cert in certs {
-            connector.cert_store_mut().add_cert(cert)?;
+            if let Err(err) = connector.cert_store_mut().add_cert(cert) {
+                debug!("load_android_root_certs error: {:?}", err);
+            }
         }
     }
 

src/lib.rs

@@ -109,6 +109,9 @@ use std::fmt;
 use std::io;
 use std::result;
 
+#[cfg(target_os = "android")]
+#[macro_use]
+extern crate log;
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 #[path = "imp/security_framework.rs"]
 mod imp;