From 0359afb99ec7452ebc524d4e9999c6ef72ac951d Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 10 Aug 2016 22:02:36 -0700
Subject: [PATCH] Little tweaks

---
 openssl/src/ssl/mod.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 78a5b2ce..82ee3127 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -733,6 +733,7 @@ pub struct CipherBits {
     pub secret: i32,
     /// The number of bits processed by the chosen algorithm, if not None.
     pub algorithm: Option<i32>,
+    _p: (),
 }
 
 
@@ -771,11 +772,13 @@ impl<'a> SslCipher<'a> {
                 CipherBits {
                     secret: secret_bits,
                     algorithm: Some(*algo_bits),
+                    _p: (),
                 }
             } else {
                 CipherBits {
                     secret: secret_bits,
                     algorithm: None,
+                    _p: (),
                 }
             }
         }
@@ -1015,10 +1018,10 @@ impl<'a> SslRef<'a> {
         Some(s)
     }
 
-    pub fn ssl_method(&self) -> Option<SslMethod> {
+    pub fn ssl_method(&self) -> SslMethod {
         unsafe {
             let method = ffi::SSL_get_ssl_method(self.as_ptr());
-            SslMethod::from_raw(method)
+            SslMethod::from_raw(method).unwrap()
         }
     }
 
@@ -1254,7 +1257,7 @@ impl<S> MidHandshakeSslStream<S> {
         self.stream.get_mut()
     }
 
-    /// Returns a shared reference to the `SslContext` of the stream.
+    /// Returns a shared reference to the `Ssl` of the stream.
     pub fn ssl(&self) -> &Ssl {
         self.stream.ssl()
     }