OpenE2K
/
libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-add trait implementations of `af_alg_iv` and mark them as deprecated.

This commit is contained in:
Eduardo Sánchez Muñoz 2020-10-15 22:23:24 +02:00
parent 4b6ffb7aaf
commit 5b221b2179
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/unix/linux_like/android/mod.rs
View File

@ -306,6 +306,8 @@ s_no_extra_traits! {
pub salg_name: [::c_uchar; 64],
}
/// WARNING: The `PartialEq`, `Eq` and `Hash` implementations of this
/// type are unsound and will be removed in the future.
pub struct af_alg_iv {
pub ivlen: u32,
pub iv: [::c_uchar; 0],
@ -591,6 +593,31 @@ cfg_if! {
}
}
impl af_alg_iv {
fn as_slice(&self) -> &[u8] {
unsafe {
::core::slice::from_raw_parts(
self.iv.as_ptr(),
self.ivlen as usize
)
}
}
}
#[deprecated(
note = "this trait implementation is unsound and will be removed"
)]
impl PartialEq for af_alg_iv {
fn eq(&self, other: &af_alg_iv) -> bool {
*self.as_slice() == *other.as_slice()
}
}
#[deprecated(
note = "this trait implementation is unsound and will be removed"
)]
impl Eq for af_alg_iv {}
impl ::fmt::Debug for af_alg_iv {
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
f.debug_struct("af_alg_iv")
@ -598,6 +625,15 @@ cfg_if! {
.finish()
}
}
#[deprecated(
note = "this trait implementation is unsound and will be removed"
)]
impl ::hash::Hash for af_alg_iv {
fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
self.as_slice().hash(state);
}
}
}
}

36
src/unix/linux_like/linux/mod.rs
View File

@ -538,6 +538,8 @@ s_no_extra_traits! {
pub salg_name: [::c_uchar; 64],
}
/// WARNING: The `PartialEq`, `Eq` and `Hash` implementations of this
/// type are unsound and will be removed in the future.
pub struct af_alg_iv {
pub ivlen: u32,
pub iv: [::c_uchar; 0],
@ -781,6 +783,31 @@ cfg_if! {
}
}
impl af_alg_iv {
fn as_slice(&self) -> &[u8] {
unsafe {
::core::slice::from_raw_parts(
self.iv.as_ptr(),
self.ivlen as usize
)
}
}
}
#[deprecated(
note = "this trait implementation is unsound and will be removed"
)]
impl PartialEq for af_alg_iv {
fn eq(&self, other: &af_alg_iv) -> bool {
*self.as_slice() == *other.as_slice()
}
}
#[deprecated(
note = "this trait implementation is unsound and will be removed"
)]
impl Eq for af_alg_iv {}
impl ::fmt::Debug for af_alg_iv {
fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
f.debug_struct("af_alg_iv")
@ -789,6 +816,15 @@ cfg_if! {
}
}
#[deprecated(
note = "this trait implementation is unsound and will be removed"
)]
impl ::hash::Hash for af_alg_iv {
fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
self.as_slice().hash(state);
}
}
impl PartialEq for mq_attr {
fn eq(&self, other: &mq_attr) -> bool {
self.mq_flags == other.mq_flags &&