yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark chacha20_xor_inner as unsafe.

Browse Source 
It deals with pointers and (indirectly) dereferences them.
This commit is contained in:
Brian Smith 2018-12-05 18:59:19 -10:00
parent c28be94ecb
commit d02327f7d5
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/aead/chacha.rs
View File

@ -26,13 +26,15 @@ impl<'a> From<&'a [u8; KEY_LEN]> for Key {
#[inline]
pub fn chacha20_xor_in_place(key: &Key, counter: &Counter, in_out: &mut [u8]) {
chacha20_xor_inner(
key,
counter,
in_out.as_ptr(),
in_out.len(),
in_out.as_mut_ptr(),
);
unsafe {
chacha20_xor_inner(
key,
counter,
in_out.as_ptr(),
in_out.len(),
in_out.as_mut_ptr(),
);
}
}
pub fn chacha20_xor_overlapping(
@ -51,25 +53,28 @@ pub fn chacha20_xor_overlapping(
}
chacha20_xor_in_place(key, &counter, &mut in_out[..len]);
} else {
chacha20_xor_inner(
key,
counter,
in_out[in_prefix_len..].as_ptr(),
len,
in_out.as_mut_ptr(),
);
unsafe {
chacha20_xor_inner(
key,
counter,
in_out[in_prefix_len..].as_ptr(),
len,
in_out.as_mut_ptr(),
);
}
}
}
#[inline]
pub fn chacha20_xor_inner(
unsafe fn chacha20_xor_inner(
key: &Key, counter: &Counter, input: *const u8, in_out_len: usize, output: *mut u8,
) {
debug_assert!(core::mem::align_of_val(key) >= 4);
debug_assert!(core::mem::align_of_val(counter) >= 4);
unsafe {
GFp_ChaCha20_ctr32(output, input, in_out_len, key, counter);
extern "C" {
fn GFp_ChaCha20_ctr32(
out: *mut u8, in_: *const u8, in_len: c::size_t, key: &Key, counter: &Counter,
);
}
GFp_ChaCha20_ctr32(output, input, in_out_len, key, counter);
}
pub type Counter = [u32; 4];
@ -84,6 +89,7 @@ pub fn make_counter(nonce: &[u8; NONCE_LEN], counter: u32) -> Counter {
]
}
#[cfg(test)]
extern "C" {
fn GFp_ChaCha20_ctr32(
out: *mut u8, in_: *const u8, in_len: c::size_t, key: &Key, counter: &Counter,