Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for linking against boringssl #1649

Merged
merged 5 commits into from
Sep 26, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into boringssl
  • Loading branch information
sfackler authored Sep 26, 2022

Verified

This commit was signed with the committer’s verified signature.
doppins-bot Doppins
commit c49476b6650885d5a6b7ebeb07c999af29333018
4 changes: 2 additions & 2 deletions openssl/src/ssl/bio.rs
Original file line number Diff line number Diff line change
@@ -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);
}
}
}
2 changes: 1 addition & 1 deletion openssl/src/ssl/mod.rs
Original file line number Diff line number Diff line change
@@ -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);
}
}

You are viewing a condensed version of this merge commit. You can view the full changes here.