Macroise from_pem

1 files changed, 30 insertions, 9 deletions

diff --git a/openssl/src/macros.rs b/openssl/src/macros.rs
index a57f36eb..b36e8319 100644
--- a/openssl/src/macros.rs
+++ b/openssl/src/macros.rs
@@ -42,15 +42,8 @@ macro_rules! type_ {
 
 macro_rules! private_key_from_pem {
     ($t:ident, $f:path) => {
-        /// Deserializes a PEM-formatted private key.
-        pub fn private_key_from_pem(pem: &[u8]) -> Result<$t, ::error::ErrorStack> {
-            unsafe {
-                ::init();
-                let bio = try!(::bio::MemBioSlice::new(pem));
-                cvt_p($f(bio.as_ptr(), ::std::ptr::null_mut(), None, ::std::ptr::null_mut()))
-                    .map($t)
-            }
-        }
+        from_pem_inner!(/// Deserializes a PEM-formatted private key.
+            private_key_from_pem, $t, $f);
 
         /// Deserializes a PEM-formatted private key, using the supplied password if the key is
         /// encrypted.
@@ -232,3 +225,31 @@ macro_rules! public_key_from_der {
             public_key_from_der, $t, $f);
     }
 }
+
+macro_rules! from_pem_inner {
+    (#[$m:meta] $n:ident, $t:ident, $f:path) => {
+        #[$m]
+        pub fn $n(pem: &[u8]) -> Result<$t, ::error::ErrorStack> {
+            unsafe {
+                ::init();
+                let bio = try!(::bio::MemBioSlice::new(pem));
+                cvt_p($f(bio.as_ptr(), ::std::ptr::null_mut(), None, ::std::ptr::null_mut()))
+                    .map($t)
+            }
+        }
+    }
+}
+
+macro_rules! public_key_from_pem {
+    ($t:ident, $f:path) => {
+        from_pem_inner!(/// Deserializes a public key from PEM-formatted data.
+            public_key_from_pem, $t, $f);
+    }
+}
+
+macro_rules! from_pem {
+    ($t:ident, $f:path) => {
+        from_pem_inner!(/// Deserializes a value from PEM-formatted data.
+            from_pem, $t, $f);
+    }
+}