Unverified Commit c49476b6 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge branch 'master' into boringssl

parents f5cb7519 7ef9ab26

openssl/src/lib.rs

+1 −1
Original line number Diff line number Diff line 
//! Bindings to OpenSSL

//!

//! This crate provides a safe interface to the popular OpenSSL cryptography library. OpenSSL versions 1.0.1 through

//! 1.1.1 and LibreSSL versions 2.5 through 3.4.1 are supported.

//! 3.x.x and LibreSSL versions 2.5 through 3.4.1 are supported.

//!

//! # Building

//!

openssl/src/ssl/bio.rs

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ unsafe extern "C" fn destroy<S>(bio: *mut BIO) -> c_int { 


    let data = BIO_get_data(bio);

    assert!(!data.is_null());

    drop(Box::<StreamState<S>>::from_raw(data as *mut _));

    let _ = Box::<StreamState<S>>::from_raw(data as *mut _);

    BIO_set_data(bio, ptr::null_mut());

    BIO_set_init(bio, 0);

    1
@@ -257,7 +257,7 @@ cfg_if! { 
        impl Drop for BIO_METHOD {

            fn drop(&mut self) {

                unsafe {

                    drop(Box::<ffi::BIO_METHOD>::from_raw(self.0));

                    let _ = Box::<ffi::BIO_METHOD>::from_raw(self.0);

                }

            }

        }

openssl/src/ssl/mod.rs

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ unsafe extern "C" fn free_data_box<T>( 
    _argp: *mut c_void,

) {

    if !ptr.is_null() {

        drop(Box::<T>::from_raw(ptr as *mut T));

        let _ = Box::<T>::from_raw(ptr as *mut T);

    }

}