Commit 234f126d authored by Steven Fackler's avatar Steven Fackler
Browse files

Cleanup

parent 8b60d4a3

openssl/src/ssl/bio.rs

+4 −9
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ use std::any::Any; 
use std::io;

use std::io::prelude::*;

use std::mem;

use std::panic::{AssertUnwindSafe, catch_unwind};

use std::ptr;

use std::slice;
@@ -70,19 +71,13 @@ unsafe fn state<'a, S: 'a>(bio: *mut BIO) -> &'a mut StreamState<S> { 
    mem::transmute(compat::BIO_get_data(bio))

}



fn catch_unwind<F, T>(f: F) -> Result<T, Box<Any + Send>>

    where F: FnOnce() -> T

{

    ::std::panic::catch_unwind(::std::panic::AssertUnwindSafe(f))

}



unsafe extern "C" fn bwrite<S: Write>(bio: *mut BIO, buf: *const c_char, len: c_int) -> c_int {

    BIO_clear_retry_flags(bio);



    let state = state::<S>(bio);

    let buf = slice::from_raw_parts(buf as *const _, len as usize);



    match catch_unwind(|| state.stream.write(buf)) {

    match catch_unwind(AssertUnwindSafe(|| state.stream.write(buf))) {

        Ok(Ok(len)) => len as c_int,

        Ok(Err(err)) => {

            if retriable_error(&err) {
@@ -104,7 +99,7 @@ unsafe extern "C" fn bread<S: Read>(bio: *mut BIO, buf: *mut c_char, len: c_int) 
    let state = state::<S>(bio);

    let buf = slice::from_raw_parts_mut(buf as *mut _, len as usize);



    match catch_unwind(|| state.stream.read(buf)) {

    match catch_unwind(AssertUnwindSafe(|| state.stream.read(buf))) {

        Ok(Ok(len)) => len as c_int,

        Ok(Err(err)) => {

            if retriable_error(&err) {
@@ -140,7 +135,7 @@ unsafe extern "C" fn ctrl<S: Write>(bio: *mut BIO, 
    if cmd == BIO_CTRL_FLUSH {

        let state = state::<S>(bio);



        match catch_unwind(|| state.stream.flush()) {

        match catch_unwind(AssertUnwindSafe(|| state.stream.flush())) {

            Ok(Ok(())) => 1,

            Ok(Err(err)) => {

                state.error = Some(err);

openssl/src/ssl/connector.rs

+2 −2
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ fn ctx(method: SslMethod) -> Result<SslContextBuilder, ErrorStack> { 
    let mut ctx = try!(SslContextBuilder::new(method));



    let mut opts = ssl::SSL_OP_ALL;

    opts |= ssl::SSL_OP_NO_TICKET;

    opts |= ssl::SSL_OP_NO_COMPRESSION;

    opts &= !ssl::SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG;

    opts &= !ssl::SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;

    opts |= ssl::SSL_OP_NO_TICKET;

    opts |= ssl::SSL_OP_NO_COMPRESSION;

    opts |= ssl::SSL_OP_NO_SSLV2;

    opts |= ssl::SSL_OP_NO_SSLV3;

    opts |= ssl::SSL_OP_SINGLE_DH_USE;

openssl/src/ssl/mod.rs

+2 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ use std::io::prelude::*; 
use std::marker::PhantomData;

use std::mem;

use std::ops::{Deref, DerefMut};

use std::panic::resume_unwind;

use std::path::Path;

use std::ptr;

use std::slice;
@@ -1601,7 +1602,7 @@ impl<S> SslStream<S> { 


    fn check_panic(&mut self) {

        if let Some(err) = unsafe { bio::take_panic::<S>(self.ssl.get_raw_rbio()) } {

            ::std::panic::resume_unwind(err)

            resume_unwind(err)

        }

    }