Merge pull request sfackler#779 from sfackler/revert-778-foreign-types

Revert "Update foreign-types to 0.3"

openssl/Cargo.toml

@@ -20,7 +20,7 @@ v110 = []
 
 [dependencies]
 bitflags = "0.9"
-foreign-types = "0.3"
+foreign-types = "0.2"
 lazy_static = "0.2"
 libc = "0.2"
 openssl-sys = { version = "0.9.21", path = "../openssl-sys" }

openssl/src/bn.rs

@@ -1090,6 +1090,12 @@ impl BigNum {
     }
 }
 
+impl AsRef<BigNumRef> for BigNum {
+    fn as_ref(&self) -> &BigNumRef {
+        self.deref()
+    }
+}
+
 impl fmt::Debug for BigNumRef {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self.to_dec_str() {

openssl/src/ssl/mod.rs

@@ -76,6 +76,7 @@ use libc::{c_int, c_long, c_ulong, c_void};
 use libc::{c_uchar, c_uint};
 use std::any::Any;
 use std::any::TypeId;
+use std::borrow::Borrow;
 use std::cmp;
 use std::collections::HashMap;
 use std::ffi::{CStr, CString};
@@ -1025,6 +1026,12 @@ impl Clone for SslSession {
     }
 }
 
+impl Borrow<SslSessionRef> for SslSession {
+    fn borrow(&self) -> &SslSessionRef {
+        &self
+    }
+}
+
 impl ToOwned for SslSessionRef {
     type Owned = SslSession;
 

openssl/src/x509/mod.rs

@@ -2,6 +2,7 @@
 use libc::{c_int, c_long};
 use ffi;
 use foreign_types::{ForeignType, ForeignTypeRef};
+use std::borrow::Borrow;
 use std::collections::HashMap;
 use std::error::Error;
 use std::ffi::{CStr, CString};
@@ -619,12 +620,24 @@ impl Clone for X509 {
     }
 }
 
+impl AsRef<X509Ref> for X509 {
+    fn as_ref(&self) -> &X509Ref {
+        &*self
+    }
+}
+
 impl AsRef<X509Ref> for X509Ref {
     fn as_ref(&self) -> &X509Ref {
         self
     }
 }
 
+impl Borrow<X509Ref> for X509 {
+    fn borrow(&self) -> &X509Ref {
+        &*self
+    }
+}
+
 impl Stackable for X509 {
     type StackType = ffi::stack_st_X509;
 }