Port blackbeam/rust-mysql-simple#248

Author: blackbeam

src/io/mod.rs

@@ -175,10 +175,11 @@ impl Endpoint {
         let mut builder = TlsConnector::builder();
         match ssl_opts.root_cert_path() {
             Some(root_cert_path) => {
-                let mut root_cert_der = vec![];
+                let mut root_cert_data = vec![];
                 let mut root_cert_file = File::open(root_cert_path)?;
-                root_cert_file.read_to_end(&mut root_cert_der)?;
-                let root_cert = Certificate::from_der(&*root_cert_der)?;
+                root_cert_file.read_to_end(&mut root_cert_data)?;
+                let root_cert = Certificate::from_pem(&*root_cert_data)
+                    .or_else(|_| Certificate::from_der(&*root_cert_data))?;
                 builder.add_root_certificate(root_cert);
             }
             None => (),

src/opts.rs

@@ -136,7 +136,7 @@ pub struct SslOpts {
 }
 
 impl SslOpts {
-    /// Sets path to the pkcs12 archive.
+    /// Sets path to the pkcs12 archive (in `der` format).
     pub fn with_pkcs12_path<T: Into<Cow<'static, Path>>>(mut self, pkcs12_path: Option<T>) -> Self {
         self.pkcs12_path = pkcs12_path.map(Into::into);
         self
@@ -148,7 +148,7 @@ impl SslOpts {
         self
     }
 
-    /// Sets path to a der certificate of the root that connector will trust.
+    /// Sets path to a `pem` or `der` certificate of the root that connector will trust.
     pub fn with_root_cert_path<T: Into<Cow<'static, Path>>>(
         mut self,
         root_cert_path: Option<T>,