From c9220900753052a946abf6ac6de172d4a5e98b43 Mon Sep 17 00:00:00 2001
From: Valerii Hiora <valerii.hiora@gmail.com>
Date: Thu, 11 Dec 2014 13:44:37 +0200
Subject: Update to nightly: explicit Copy trait

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

(limited to 'src/ssl/mod.rs')

diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs
index 6112bc8d..5aa60666 100644
--- a/src/ssl/mod.rs
+++ b/src/ssl/mod.rs
@@ -33,6 +33,7 @@ fn init() {
 /// Determines the SSL method supported
 #[deriving(Show, Hash, PartialEq, Eq)]
 #[allow(non_camel_case_types)]
+#[deriving(Copy)]
 pub enum SslMethod {
     #[cfg(feature = "sslv2")]
     /// Only support the SSLv2 protocol, requires `feature="sslv2"`
@@ -68,6 +69,7 @@ impl SslMethod {
 }
 
 /// Determines the type of certificate verification used
+#[deriving(Copy)]
 #[repr(i32)]
 pub enum SslVerifyMode {
     /// Verify that the server's certificate is trusted
-- 
cgit v1.2.3


From 6119d916cb57422d6f51b921f40239dbdf53b4fc Mon Sep 17 00:00:00 2001
From: Valerii Hiora <valerii.hiora@gmail.com>
Date: Mon, 15 Dec 2014 14:01:17 +0200
Subject: Track master: proc removal, tuple indexing

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

(limited to 'src/ssl/mod.rs')

diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs
index 5aa60666..8930a3c5 100644
--- a/src/ssl/mod.rs
+++ b/src/ssl/mod.rs
@@ -541,7 +541,7 @@ impl<S: Stream> Writer for SslStream<S> {
         let mut start = 0;
         while start < buf.len() {
             let ret = self.in_retry_wrapper(|ssl| {
-                ssl.write(buf.split_at(start).val1())
+                ssl.write(buf.split_at(start).1)
             });
             match ret {
                 Ok(len) => start += len as uint,
-- 
cgit v1.2.3


From 217dad59dfbed952aa3eb0b18045dfbc1fe61b67 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Fri, 19 Dec 2014 19:56:31 -0800
Subject: Print unexpected error codes

This is breaking occaisionally but I can't repro it locally :(
---
 src/ssl/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ssl/mod.rs')

diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs
index 8930a3c5..b0db32ea 100644
--- a/src/ssl/mod.rs
+++ b/src/ssl/mod.rs
@@ -384,7 +384,7 @@ impl Ssl {
 
 }
 
-#[deriving(FromPrimitive)]
+#[deriving(FromPrimitive, Show)]
 #[repr(i32)]
 enum LibSslError {
     ErrorNone = ffi::SSL_ERROR_NONE,
@@ -489,7 +489,7 @@ impl<S: Stream> SslStream<S> {
                 LibSslError::ErrorWantWrite => { try_ssl_stream!(self.flush()) }
                 LibSslError::ErrorZeroReturn => return Err(SslSessionClosed),
                 LibSslError::ErrorSsl => return Err(SslError::get()),
-                _ => unreachable!()
+                err => panic!("unexpected error {}", err),
             }
         }
     }
-- 
cgit v1.2.3


From 7774e672a2c190dcf7a594882620b1fb607a3c13 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 23 Dec 2014 08:14:42 -0800
Subject: Update to rust master

---
 src/ssl/mod.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/ssl/mod.rs')

diff --git a/src/ssl/mod.rs b/src/ssl/mod.rs
index b0db32ea..43673596 100644
--- a/src/ssl/mod.rs
+++ b/src/ssl/mod.rs
@@ -93,8 +93,9 @@ fn get_verify_data_idx<T>() -> c_int {
 
     unsafe {
         INIT.doit(|| {
+            let f: ffi::CRYPTO_EX_free = free_data_box::<T>;
             let idx = ffi::SSL_CTX_get_ex_new_index(0, ptr::null(), None,
-                                                    None, Some(free_data_box::<T>));
+                                                    None, Some(f));
             assert!(idx >= 0);
             VERIFY_DATA_IDX = idx;
         });
@@ -199,7 +200,9 @@ impl SslContext {
         unsafe {
             ffi::SSL_CTX_set_ex_data(self.ctx, VERIFY_IDX,
                                      mem::transmute(verify));
-            ffi::SSL_CTX_set_verify(self.ctx, mode as c_int, Some(raw_verify));
+            let f: extern fn(c_int, *mut ffi::X509_STORE_CTX) -> c_int =
+                                raw_verify;
+            ffi::SSL_CTX_set_verify(self.ctx, mode as c_int, Some(f));
         }
     }
 
@@ -216,7 +219,9 @@ impl SslContext {
                                      mem::transmute(Some(verify)));
             ffi::SSL_CTX_set_ex_data(self.ctx, get_verify_data_idx::<T>(),
                                      mem::transmute(data));
-            ffi::SSL_CTX_set_verify(self.ctx, mode as c_int, Some(raw_verify_with_data::<T>));
+            let f: extern fn(c_int, *mut ffi::X509_STORE_CTX) -> c_int =
+                                raw_verify_with_data::<T>;
+            ffi::SSL_CTX_set_verify(self.ctx, mode as c_int, Some(f));
         }
     }
 
-- 
cgit v1.2.3