From c9220900753052a946abf6ac6de172d4a5e98b43 Mon Sep 17 00:00:00 2001 From: Valerii Hiora 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') 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 Date: Mon, 15 Dec 2014 14:01:17 +0200 Subject: Track master: proc removal, tuple indexing --- src/ssl/mod.rs | 2 +- src/ssl/tests.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ssl') 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 Writer for SslStream { 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, diff --git a/src/ssl/tests.rs b/src/ssl/tests.rs index e4414f84..127b87d1 100644 --- a/src/ssl/tests.rs +++ b/src/ssl/tests.rs @@ -198,7 +198,7 @@ fn test_clone() { let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); let mut stream = SslStream::new(&SslContext::new(Sslv23).unwrap(), stream).unwrap(); let mut stream2 = stream.clone(); - spawn(proc() { + spawn(move || { stream2.write("GET /\r\n\r\n".as_bytes()).unwrap(); stream2.flush().unwrap(); }); -- cgit v1.2.3 From 217dad59dfbed952aa3eb0b18045dfbc1fe61b67 Mon Sep 17 00:00:00 2001 From: Steven Fackler 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') 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 SslStream { 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 Date: Tue, 23 Dec 2014 08:14:42 -0800 Subject: Update to rust master --- src/ssl/mod.rs | 11 ++++++++--- src/ssl/tests.rs | 21 +++++++++++---------- 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'src/ssl') 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() -> c_int { unsafe { INIT.doit(|| { + let f: ffi::CRYPTO_EX_free = free_data_box::; let idx = ffi::SSL_CTX_get_ex_new_index(0, ptr::null(), None, - None, Some(free_data_box::)); + 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::(), mem::transmute(data)); - ffi::SSL_CTX_set_verify(self.ctx, mode as c_int, Some(raw_verify_with_data::)); + let f: extern fn(c_int, *mut ffi::X509_STORE_CTX) -> c_int = + raw_verify_with_data::; + ffi::SSL_CTX_set_verify(self.ctx, mode as c_int, Some(f)); } } diff --git a/src/ssl/tests.rs b/src/ssl/tests.rs index 127b87d1..6723fa58 100644 --- a/src/ssl/tests.rs +++ b/src/ssl/tests.rs @@ -1,10 +1,11 @@ use serialize::hex::FromHex; -use std::io::{Writer}; use std::io::net::tcp::TcpStream; +use std::io::{Writer}; +use std::thread::Thread; use crypto::hash::HashType::{SHA256}; use ssl::SslMethod::Sslv23; -use ssl::{SslContext, SslStream}; +use ssl::{SslContext, SslStream, VerifyCallback}; use ssl::SslVerifyMode::SslVerifyPeer; use x509::{X509StoreContext}; @@ -52,7 +53,7 @@ fn test_verify_untrusted_callback_override_ok() { } let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); - ctx.set_verify(SslVerifyPeer, Some(callback)); + ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback)); match SslStream::new(&ctx, stream) { Ok(_) => (), Err(err) => panic!("Expected success, got {}", err) @@ -66,7 +67,7 @@ fn test_verify_untrusted_callback_override_bad() { } let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); - ctx.set_verify(SslVerifyPeer, Some(callback)); + ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback)); assert!(SslStream::new(&ctx, stream).is_err()); } @@ -77,7 +78,7 @@ fn test_verify_trusted_callback_override_ok() { } let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); - ctx.set_verify(SslVerifyPeer, Some(callback)); + ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback)); match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} Some(err) => panic!("Unexpected error {}", err) @@ -95,7 +96,7 @@ fn test_verify_trusted_callback_override_bad() { } let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); - ctx.set_verify(SslVerifyPeer, Some(callback)); + ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback)); match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} Some(err) => panic!("Unexpected error {}", err) @@ -111,7 +112,7 @@ fn test_verify_callback_load_certs() { } let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); - ctx.set_verify(SslVerifyPeer, Some(callback)); + ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback)); assert!(SslStream::new(&ctx, stream).is_ok()); } @@ -123,7 +124,7 @@ fn test_verify_trusted_get_error_ok() { } let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); - ctx.set_verify(SslVerifyPeer, Some(callback)); + ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback)); match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} Some(err) => panic!("Unexpected error {}", err) @@ -139,7 +140,7 @@ fn test_verify_trusted_get_error_err() { } let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); let mut ctx = SslContext::new(Sslv23).unwrap(); - ctx.set_verify(SslVerifyPeer, Some(callback)); + ctx.set_verify(SslVerifyPeer, Some(callback as VerifyCallback)); assert!(SslStream::new(&ctx, stream).is_err()); } @@ -198,7 +199,7 @@ fn test_clone() { let stream = TcpStream::connect("127.0.0.1:15418").unwrap(); let mut stream = SslStream::new(&SslContext::new(Sslv23).unwrap(), stream).unwrap(); let mut stream2 = stream.clone(); - spawn(move || { + let _t = Thread::spawn(move || { stream2.write("GET /\r\n\r\n".as_bytes()).unwrap(); stream2.flush().unwrap(); }); -- cgit v1.2.3