address some review comments

Author: Goirad

Cargo.toml

@@ -10,13 +10,10 @@ readme = "README.md"
 [features]
 vendored = ["openssl/vendored"]
 
-[dependencies]
-lazy_static = "1.0"
-rustc-serialize = "0.3"
-
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies]
 security-framework = "0.3.1"
 security-framework-sys = "0.3.1"
+lazy_static = "1.0"
 libc = "0.2"
 tempfile = "3.0"
 

src/lib.rs

@@ -27,7 +27,7 @@
 //! * TLS/SSL client communication
 //! * TLS/SSL server communication
 //! * PKCS#12 encoded identities
-//! * PKCS#8  encoded identities
+//! * X.509/PKCS#8 encoded identities
 //! * Secure-by-default for client and server
 //!     * Includes hostname verification for clients
 //! * Supports asynchronous I/O for both the server and the client
@@ -98,12 +98,12 @@
 #![warn(missing_docs)]
 
 #[macro_use]
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 extern crate lazy_static;
 
 #[cfg(test)]
 extern crate hex;
 
-extern crate rustc_serialize;
 mod pem;
 
 use std::any::Any;

src/pem.rs

@@ -1,39 +1,4 @@
 #![allow(unused)]
-use rustc_serialize::base64::{self, FromBase64, ToBase64};
-
-/// Type of the various `PEM_*` constants supplied to `pem_to_der` / `der_to_pem`.
-pub struct PemGuard {
-    begin: &'static str,
-    end: &'static str,
-}
-
-macro_rules! pem_guard {
-    ($n:expr) => {
-        &PemGuard {
-            begin: concat!("-----BEGIN ", $n, "-----"),
-            end: concat!("-----END ", $n, "-----"),
-        }
-    }
-}
-
-// Ref. RFC7468, although these are not universally respected.
-pub const PEM_CERTIFICATE: &'static PemGuard = pem_guard!("CERTIFICATE");
-pub const PEM_CERTIFICATE_REQUEST: &'static PemGuard = pem_guard!("CERTIFICATE REQUEST");
-pub const PEM_ENCRYPTED_PRIVATE_KEY: &'static PemGuard = pem_guard!("ENCRYPTED PRIVATE KEY");
-pub const PEM_PRIVATE_KEY: &'static PemGuard = pem_guard!("PRIVATE KEY");
-pub const PEM_PUBLIC_KEY: &'static PemGuard = pem_guard!("PUBLIC KEY");
-pub const PEM_CMS: &'static PemGuard = pem_guard!("CMS");
-
-const BASE64_PEM_WRAP: usize = 64;
-
-lazy_static!{
-    static ref BASE64_PEM: base64::Config = base64::Config {
-        char_set: base64::CharacterSet::Standard,
-        newline: base64::Newline::LF,
-        pad: true,
-        line_length: Some(BASE64_PEM_WRAP),
-    };
-}
 
 /// Split data by PEM guard lines
 pub struct PemBlock<'a> {