Merge branch 'release-v0.7.9' into releasev0.7.9

1 files changed, 4 insertions, 4 deletions

diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 38527dc6..7b5cf492 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -35,6 +35,8 @@ mod bio;
 #[cfg(test)]
 mod tests;
 
+use self::bio::BioMethod;
+
 #[doc(inline)]
 pub use ssl::error::Error;
 
@@ -827,7 +829,7 @@ impl <'a> SslCipher<'a> {
             let desc_ptr = ffi::SSL_CIPHER_description(self.cipher, buf.as_mut_ptr(), 128);
 
             if !desc_ptr.is_null() {
-                String::from_utf8(CStr::from_ptr(desc_ptr).to_bytes().to_vec()).ok()
+                String::from_utf8(CStr::from_ptr(desc_ptr as *const _).to_bytes().to_vec()).ok()
             } else {
                 None
             }
@@ -1117,12 +1119,10 @@ make_LibSslError! {
 /// A stream wrapper which handles SSL encryption for an underlying stream.
 pub struct SslStream<S> {
     ssl: Ssl,
-    _method: Arc<ffi::BIO_METHOD>, // NOTE: this *must* be after the Ssl field so things drop right
+    _method: Arc<BioMethod>, // NOTE: this *must* be after the Ssl field so things drop right
     _p: PhantomData<S>,
 }
 
-unsafe impl<S: Send> Send for SslStream<S> {}
-
 /// # Deprecated
 ///
 /// This method does not behave as expected and will be removed in a future