From 4fd169a1e5d465a10d5a815877479baa960a16eb Mon Sep 17 00:00:00 2001
From: Valerii Hiora <valerii.hiora@gmail.com>
Date: Wed, 24 Sep 2014 19:17:17 +0300
Subject: Certificate/pkey generation & PEM export

Required quite a lot of refactoring
---
 src/bio/mod.rs | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 src/bio/mod.rs

(limited to 'src/bio')

diff --git a/src/bio/mod.rs b/src/bio/mod.rs
new file mode 100644
index 00000000..019129ea
--- /dev/null
+++ b/src/bio/mod.rs
@@ -0,0 +1,106 @@
+use libc::{c_void, c_int};
+use std::io::{IoResult, IoError, OtherIoError};
+use std::io::{Reader, Writer};
+use std::ptr;
+
+use ssl::error::{SslError};
+
+pub struct MemBio {
+    bio: *mut ffi::BIO,
+    owned: bool
+}
+
+impl Drop for MemBio {
+    fn drop(&mut self) {
+        if self.owned {
+            unsafe {
+                ffi::BIO_free_all(self.bio);
+            }
+        }
+    }
+}
+
+impl MemBio {
+    /// Creates a new owned memory based BIO
+    pub fn new() -> Result<MemBio, SslError> {
+        let bio = unsafe { ffi::BIO_new(ffi::BIO_s_mem()) };
+        try_ssl_null!(bio);
+
+        Ok(MemBio {
+            bio: bio,
+            owned: true
+        })
+    }
+
+    /// Returns a "borrow", i.e. it has no ownership
+    pub fn borrowed(bio: *mut ffi::BIO) -> MemBio {
+        MemBio {
+            bio: bio,
+            owned: false
+        }
+    }
+
+    /// Consumes current bio and returns wrapped value
+    /// Note that data ownership is lost and
+    /// should be handled manually
+    pub unsafe fn unwrap(self) -> *mut ffi::BIO {
+        let mut t = self;
+        t.owned = false;
+        t.bio
+    }
+
+    /// Temporarily gets wrapped value
+    pub unsafe fn get_handle(&self) -> *mut ffi::BIO {
+        self.bio
+    }
+}
+
+impl Reader for MemBio {
+    fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> {
+        // FIXME: merge with read
+        let ret = unsafe {
+            ffi::BIO_read(self.bio, buf.as_ptr() as *mut c_void,
+                          buf.len() as c_int)
+        };
+
+        if ret < 0 {
+            // FIXME: provide details from OpenSSL
+            Err(IoError{kind: OtherIoError, desc: "mem bio read error", detail: None})
+        } else {
+            Ok(ret as uint)
+        }
+    }
+}
+
+impl Writer for MemBio {
+    fn write(&mut self, buf: &[u8]) -> IoResult<()> {
+        // FIXME: merge with write
+        let ret = unsafe {
+            ffi::BIO_write(self.bio, buf.as_ptr() as *const c_void,
+                           buf.len() as c_int)
+        };
+        if buf.len() != ret as uint {
+            // FIXME: provide details from OpenSSL
+            Err(IoError{kind: OtherIoError, desc: "mem bio write error", detail: None})
+        } else {
+            Ok(())
+        }
+    }
+}
+
+pub mod ffi {
+    #![allow(non_camel_case_types)]
+
+    use libc::{c_int, c_void};
+
+    pub type BIO = c_void;
+    pub type BIO_METHOD = c_void;
+
+    extern "C" {
+        pub fn BIO_s_mem() -> *const BIO_METHOD;
+        pub fn BIO_new(type_: *const BIO_METHOD) -> *mut BIO;
+        pub fn BIO_free_all(a: *mut BIO);
+        pub fn BIO_read(b: *mut BIO, buf: *mut c_void, len: c_int) -> c_int;
+        pub fn BIO_write(b: *mut BIO, buf: *const c_void, len: c_int) -> c_int;
+    }
+}
-- 
cgit v1.2.3


From 3f413e9354238919bce6dc87e3415919f301d487 Mon Sep 17 00:00:00 2001
From: Valerii Hiora <valerii.hiora@gmail.com>
Date: Sun, 28 Sep 2014 07:09:57 +0300
Subject: Addressed review comments

- fixed invalid file permissions

- removed redundand mem::transmute

- removed outdated FIXME's

- removed redundand temporary variable

- removed macro_export for internal macros
---
 src/bio/mod.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/bio')

diff --git a/src/bio/mod.rs b/src/bio/mod.rs
index 019129ea..f81114de 100644
--- a/src/bio/mod.rs
+++ b/src/bio/mod.rs
@@ -43,10 +43,9 @@ impl MemBio {
     /// Consumes current bio and returns wrapped value
     /// Note that data ownership is lost and
     /// should be handled manually
-    pub unsafe fn unwrap(self) -> *mut ffi::BIO {
-        let mut t = self;
-        t.owned = false;
-        t.bio
+    pub unsafe fn unwrap(mut self) -> *mut ffi::BIO {
+        self.owned = false;
+        self.bio
     }
 
     /// Temporarily gets wrapped value
@@ -57,7 +56,6 @@ impl MemBio {
 
 impl Reader for MemBio {
     fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> {
-        // FIXME: merge with read
         let ret = unsafe {
             ffi::BIO_read(self.bio, buf.as_ptr() as *mut c_void,
                           buf.len() as c_int)
@@ -74,7 +72,6 @@ impl Reader for MemBio {
 
 impl Writer for MemBio {
     fn write(&mut self, buf: &[u8]) -> IoResult<()> {
-        // FIXME: merge with write
         let ret = unsafe {
             ffi::BIO_write(self.bio, buf.as_ptr() as *const c_void,
                            buf.len() as c_int)
-- 
cgit v1.2.3