Skip to content

The scope of the unsafe block can be appropriately reduced #478

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

Open
peamaeq wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −13
Open

The scope of the unsafe block can be appropriately reduced #478

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
26 changes: 13 additions & 13 deletions src/cryptoutil.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ use symmetriccipher::{SynchronousStreamCipher, SymmetricCipherError};
pub fn write_u64_be(dst: &mut[u8], mut input: u64) {
assert!(dst.len() == 8);
input = input.to_be();
let tmp = &input as *const _ as *const u8;
unsafe {
let tmp = &input as *const _ as *const u8;
ptr::copy_nonoverlapping(tmp, dst.get_unchecked_mut(0), 8);
}
}
Expand All @@ -32,8 +32,8 @@ pub fn write_u64_be(dst: &mut[u8], mut input: u64) {
pub fn write_u64_le(dst: &mut[u8], mut input: u64) {
assert!(dst.len() == 8);
input = input.to_le();
let tmp = &input as *const _ as *const u8;
unsafe {
let tmp = &input as *const _ as *const u8;
ptr::copy_nonoverlapping(tmp, dst.get_unchecked_mut(0), 8);
}
}
Expand All @@ -58,8 +58,8 @@ pub fn write_u64v_le(dst: &mut[u8], input: &[u64]) {
pub fn write_u32_be(dst: &mut [u8], mut input: u32) {
assert!(dst.len() == 4);
input = input.to_be();
let tmp = &input as *const _ as *const u8;
unsafe {
let tmp = &input as *const _ as *const u8;
ptr::copy_nonoverlapping(tmp, dst.get_unchecked_mut(0), 4);
}
}
Expand All @@ -69,8 +69,8 @@ pub fn write_u32_be(dst: &mut [u8], mut input: u32) {
pub fn write_u32_le(dst: &mut[u8], mut input: u32) {
assert!(dst.len() == 4);
input = input.to_le();
let tmp = &input as *const _ as *const u8;
unsafe {
let tmp = &input as *const _ as *const u8;
ptr::copy_nonoverlapping(tmp, dst.get_unchecked_mut(0), 4);
}
}
Expand Down Expand Up @@ -157,19 +157,19 @@ pub fn read_u32v_le(dst: &mut[u32], input: &[u8]) {
/// Read the value of a vector of bytes as a u32 value in little-endian format.
pub fn read_u32_le(input: &[u8]) -> u32 {
assert!(input.len() == 4);
unsafe {
let mut tmp: u32 = mem::uninitialized();
ptr::copy_nonoverlapping(input.get_unchecked(0), &mut tmp as *mut _ as *mut u8, 4);

let mut tmp: u32 = unsafe { mem::uninitialized() };
unsafe { ptr::copy_nonoverlapping(input.get_unchecked(0), &mut tmp as *mut _ as *mut u8, 4) };
u32::from_le(tmp)
}

}

/// Read the value of a vector of bytes as a u32 value in big-endian format.
pub fn read_u32_be(input: &[u8]) -> u32 {
assert!(input.len() == 4);
unsafe {
let mut tmp: u32 = mem::uninitialized();
ptr::copy_nonoverlapping(input.get_unchecked(0), &mut tmp as *mut _ as *mut u8, 4);

let mut tmp: u32 = unsafe { mem::uninitialized() };
unsafe { ptr::copy_nonoverlapping(input.get_unchecked(0), &mut tmp as *mut _ as *mut u8, 4) };
u32::from_be(tmp)
}
}
Expand All @@ -192,9 +192,9 @@ pub fn xor_keystream(dst: &mut[u8], plaintext: &[u8], keystream: &[u8]) {
#[inline]
pub fn copy_memory(src: &[u8], dst: &mut [u8]) {
assert!(dst.len() >= src.len());
let srcp = src.as_ptr();
let dstp = dst.as_mut_ptr();
unsafe {
let srcp = src.as_ptr();
let dstp = dst.as_mut_ptr();
ptr::copy_nonoverlapping(srcp, dstp, src.len());
}
}
Expand Down