From 38b3b4a11eabcd138e50639931254a0410869b51 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 19 Nov 2015 19:52:26 -0500
Subject: Fixed a typo in a comment.

---
 openssl/src/ssl/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openssl/src/ssl')

diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 23364ef1..2775c4c8 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -588,7 +588,7 @@ impl SslContext {
     /// If `onoff` is set to `true`, enable ECDHE for key exchange with compatible
     /// clients, and automatically select an appropriate elliptic curve.
     ///
-    /// This method requires OpenSSL >= 1.2.0 or LibreSSL and the `ecdh_auto` feature.
+    /// This method requires OpenSSL >= 1.0.2 or LibreSSL and the `ecdh_auto` feature.
     #[cfg(feature = "ecdh_auto")]
     pub fn set_ecdh_auto(&mut self, onoff: bool) -> Result<(),SslError> {
         wrap_ssl_result(
-- 
cgit v1.2.3


From 6bb3d8f1b5827ff27216d4219e08467b2461c071 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Fri, 20 Nov 2015 21:33:10 -0800
Subject: Implement try_clone for MaybeSslStream

Closes #308
---
 openssl/src/ssl/mod.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'openssl/src/ssl')

diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 2775c4c8..cca369a2 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -1416,6 +1416,16 @@ impl<S> MaybeSslStream<S> where S: Read+Write {
     }
 }
 
+impl MaybeSslStream<net::TcpStream> {
+    /// Like `TcpStream::try_clone`.
+    pub fn try_clone(&self) -> io::Result<MaybeSslStream<net::TcpStream>> {
+        match *self {
+            MaybeSslStream::Ssl(ref s) => s.try_clone().map(MaybeSslStream::Ssl),
+            MaybeSslStream::Normal(ref s) => s.try_clone().map(MaybeSslStream::Normal),
+        }
+    }
+}
+
 /// An SSL stream wrapping a nonblocking socket.
 #[derive(Clone)]
 pub struct NonblockingSslStream<S> {
-- 
cgit v1.2.3