1 files changed, 80 insertions, 10 deletions
diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs
index 879681f4..a9d937ba 100644
--- a/openssl/src/lib.rs
+++ b/openssl/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.8.3")]
+#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.9.0")]
 
 #[macro_use]
 extern crate bitflags;
@@ -11,29 +11,99 @@ extern crate openssl_sys as ffi;
 extern crate rustc_serialize as serialize;
 
 #[cfg(test)]
-extern crate net2;
+extern crate tempdir;
 
 #[doc(inline)]
 pub use ffi::init;
 
-use nid::Nid;
+use libc::c_int;
 
-mod macros;
+use error::ErrorStack;
+
+macro_rules! type_ {
+    ($n:ident, $r:ident, $c:path, $d:path) => {
+        pub struct $n(*mut $c);
+
+        impl ::types::OpenSslType for $n {
+            type CType = $c;
+            type Ref = $r;
+
+            unsafe fn from_ptr(ptr: *mut $c) -> $n {
+                $n(ptr)
+            }
+        }
+
+        impl Drop for $n {
+            fn drop(&mut self) {
+                unsafe { $d(self.0) }
+            }
+        }
+
+        impl ::std::ops::Deref for $n {
+            type Target = $r;
+
+            fn deref(&self) -> &$r {
+                unsafe { ::types::OpenSslTypeRef::from_ptr(self.0) }
+            }
+        }
+
+        impl ::std::ops::DerefMut for $n {
+            fn deref_mut(&mut self) -> &mut $r {
+                unsafe { ::types::OpenSslTypeRef::from_ptr_mut(self.0) }
+            }
+        }
+
+        pub struct $r(::util::Opaque);
+
+        impl ::types::OpenSslTypeRef for $r {
+            type CType = $c;
+        }
+    }
+}
 
-pub mod asn1;
 mod bio;
+mod util;
+pub mod asn1;
 pub mod bn;
-#[cfg(feature = "c_helpers")]
-mod c_helpers;
 pub mod crypto;
 pub mod dh;
+pub mod dsa;
+pub mod ec_key;
 pub mod error;
+pub mod hash;
+pub mod memcmp;
 pub mod nid;
+pub mod pkcs12;
+pub mod pkcs5;
+pub mod pkey;
+pub mod rand;
+pub mod types;
+pub mod rsa;
+pub mod sign;
 pub mod ssl;
+pub mod symm;
 pub mod version;
 pub mod x509;
+pub mod stack;
+#[cfg(any(ossl102, ossl110))]
+mod verify;
+
+fn cvt_p<T>(r: *mut T) -> Result<*mut T, ErrorStack> {
+    if r.is_null() {
+        Err(ErrorStack::get())
+    } else {
+        Ok(r)
+    }
+}
+
+fn cvt(r: c_int) -> Result<c_int, ErrorStack> {
+    if r <= 0 {
+        Err(ErrorStack::get())
+    } else {
+        Ok(r)
+    }
+}
 
-trait HashTypeInternals {
-    fn as_nid(&self) -> Nid;
-    fn evp_md(&self) -> *const ffi::EVP_MD;
+fn cvt_n(r: c_int) -> Result<c_int, ErrorStack> {
+    if r < 0 { Err(ErrorStack::get()) } else { Ok(r) }
 }