Skip to content

Avoid using libc::af_alg_iv to get rid of deprecation warnings #1329

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Avoid using libc::af_alg_iv to get rid of deprecation warnings #1329

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions src/sys/socket/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,22 +847,22 @@ impl<'a> ControlMessage<'a> {
}
#[cfg(any(target_os = "android", target_os = "linux"))]
ControlMessage::AlgSetIv(iv) => {
let af_alg_iv = libc::af_alg_iv {
ivlen: iv.len() as u32,
iv: [0u8; 0],
};
// libc::af_alg_iv is deprecated: https://github.com/rust-lang/libc/issues/1501
// struct af_alg_iv { ivlen: u32, iv: [c_uchar] }
// we just have to manually construct that in memory

let size = mem::size_of::<libc::af_alg_iv>();
let ivlen = iv.len() as u32;
let lensize = mem::size_of::<u32>();

unsafe {
ptr::copy_nonoverlapping(
&af_alg_iv as *const _ as *const u8,
&ivlen as *const _ as *const u8,
cmsg_data,
size,
lensize,
);
ptr::copy_nonoverlapping(
iv.as_ptr(),
cmsg_data.add(size),
cmsg_data.add(lensize),
iv.len()
);
};
Expand Down Expand Up @@ -915,7 +915,7 @@ impl<'a> ControlMessage<'a> {
}
#[cfg(any(target_os = "android", target_os = "linux"))]
ControlMessage::AlgSetIv(iv) => {
mem::size_of::<libc::af_alg_iv>() + iv.len()
mem::size_of::<u32>() + iv.len()
},
#[cfg(any(target_os = "android", target_os = "linux"))]
ControlMessage::AlgSetOp(op) => {
Expand Down