From a9a18cf337f5cf800332b4d4b2ab9d7c4eb5f77d Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 17 Mar 2016 22:23:51 -0700 Subject: Simplify panic safety logic for new nightly --- openssl/src/ssl/bio.rs | 49 +++++-------------------------------------------- 1 file changed, 5 insertions(+), 44 deletions(-) (limited to 'openssl') diff --git a/openssl/src/ssl/bio.rs b/openssl/src/ssl/bio.rs index aa445562..31658cd0 100644 --- a/openssl/src/ssl/bio.rs +++ b/openssl/src/ssl/bio.rs @@ -74,8 +74,8 @@ unsafe fn state<'a, S: 'a>(bio: *mut BIO) -> &'a mut StreamState { } #[cfg(feature = "nightly")] -fn recover(f: F) -> Result> where F: FnOnce() -> T + ::std::panic::RecoverSafe { - ::std::panic::recover(f) +fn recover(f: F) -> Result> where F: FnOnce() -> T { + ::std::panic::recover(::std::panic::AssertRecoverSafe::new(f)) } #[cfg(not(feature = "nightly"))] @@ -83,45 +83,13 @@ fn recover(f: F) -> Result> where F: FnOnce() -> T { Ok(f()) } -#[cfg(feature = "nightly")] -use std::panic::AssertRecoverSafe; - -#[cfg(not(feature = "nightly"))] -struct AssertRecoverSafe(T); - -#[cfg(not(feature = "nightly"))] -impl AssertRecoverSafe { - fn new(t: T) -> Self { - AssertRecoverSafe(t) - } -} - -#[cfg(not(feature = "nightly"))] -impl ::std::ops::Deref for AssertRecoverSafe { - type Target = T; - - fn deref(&self) -> &T { - &self.0 - } -} - -#[cfg(not(feature = "nightly"))] -impl ::std::ops::DerefMut for AssertRecoverSafe { - fn deref_mut(&mut self) -> &mut T { - &mut self.0 - } -} - unsafe extern "C" fn bwrite(bio: *mut BIO, buf: *const c_char, len: c_int) -> c_int { BIO_clear_retry_flags(bio); let state = state::(bio); let buf = slice::from_raw_parts(buf as *const _, len as usize); - let result = { - let mut youre_not_my_supervisor = AssertRecoverSafe::new(&mut *state); - recover(move || youre_not_my_supervisor.stream.write(buf)) - }; + let result = recover(|| state.stream.write(buf)); match result { Ok(Ok(len)) => len as c_int, @@ -145,11 +113,7 @@ unsafe extern "C" fn bread(bio: *mut BIO, buf: *mut c_char, len: c_int) let state = state::(bio); let buf = slice::from_raw_parts_mut(buf as *mut _, len as usize); - let result = { - let mut youre_not_my_supervisor = AssertRecoverSafe::new(&mut *state); - let mut fuuuu = AssertRecoverSafe::new(buf); - recover(move || youre_not_my_supervisor.stream.read(&mut *fuuuu)) - }; + let result = recover(|| state.stream.read(buf)); match result { Ok(Ok(len)) => len as c_int, @@ -185,10 +149,7 @@ unsafe extern "C" fn ctrl(bio: *mut BIO, -> c_long { if cmd == BIO_CTRL_FLUSH { let state = state::(bio); - let result = { - let mut youre_not_my_supervisor = AssertRecoverSafe::new(&mut *state); - recover(move || youre_not_my_supervisor.stream.flush()) - }; + let result = recover(|| state.stream.flush()); match result { Ok(Ok(())) => 1, -- cgit v1.2.3 From ade90bf004e28b0f961852383f6b8aee49d0947e Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 17 Mar 2016 22:27:16 -0700 Subject: Clean up BIO name --- openssl/src/ssl/bio.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'openssl') diff --git a/openssl/src/ssl/bio.rs b/openssl/src/ssl/bio.rs index 31658cd0..8d295928 100644 --- a/openssl/src/ssl/bio.rs +++ b/openssl/src/ssl/bio.rs @@ -11,9 +11,6 @@ use std::sync::Arc; use ssl::error::SslError; -// "rust" -const NAME: [c_char; 5] = [114, 117, 115, 116, 0]; - pub struct StreamState { pub stream: S, pub error: Option, @@ -23,7 +20,7 @@ pub struct StreamState { pub fn new(stream: S) -> Result<(*mut BIO, Arc), SslError> { let method = Arc::new(BIO_METHOD { type_: BIO_TYPE_NONE, - name: &NAME[0], + name: b"rust\0".as_ptr() as *const _, bwrite: Some(bwrite::), bread: Some(bread::), bputs: Some(bputs::), -- cgit v1.2.3 From 6d043b3700676246b46a3df7f791695b9abc169d Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 18 Mar 2016 15:44:47 +0100 Subject: Allow Rust to infer the type of the argument to SSL_CIPHER_description. This allows the code to compile on Android, where an unsigned char is expected. --- openssl/src/ssl/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openssl') diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs index 574a324b..38527dc6 100644 --- a/openssl/src/ssl/mod.rs +++ b/openssl/src/ssl/mod.rs @@ -823,8 +823,8 @@ impl <'a> SslCipher<'a> { pub fn description(&self) -> Option { unsafe { // SSL_CIPHER_description requires a buffer of at least 128 bytes. - let mut buf = [0i8; 128]; - let desc_ptr = ffi::SSL_CIPHER_description(self.cipher, &mut buf[0], 128); + let mut buf = [0; 128]; + 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() -- cgit v1.2.3 From e0412850ec3dff5beb14b870479eb9f474eaa028 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Fri, 18 Mar 2016 08:54:12 -0700 Subject: Release v0.7.8 --- openssl/Cargo.toml | 8 ++++---- openssl/src/lib.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'openssl') diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index 39adb0e3..5bfd3edb 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "openssl" -version = "0.7.7" +version = "0.7.8" authors = ["Steven Fackler "] license = "Apache-2.0" description = "OpenSSL bindings" repository = "https://github.com/sfackler/rust-openssl" -documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.7/openssl" +documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.8/openssl" readme = "../README.md" keywords = ["crypto", "tls", "ssl", "dtls"] build = "build.rs" @@ -32,8 +32,8 @@ nightly = [] bitflags = "0.4" lazy_static = "0.1" libc = "0.2" -openssl-sys = { version = "0.7.7", path = "../openssl-sys" } -openssl-sys-extras = { version = "0.7.7", path = "../openssl-sys-extras" } +openssl-sys = { version = "0.7.8", path = "../openssl-sys" } +openssl-sys-extras = { version = "0.7.8", path = "../openssl-sys-extras" } [build-dependencies] gcc = "0.3" diff --git a/openssl/src/lib.rs b/openssl/src/lib.rs index e89e6590..9db1df92 100644 --- a/openssl/src/lib.rs +++ b/openssl/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.7")] +#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.8")] #![cfg_attr(feature = "nightly", feature(const_fn, recover, panic_propagate))] #[macro_use] -- cgit v1.2.3