Use split_reserved from inout and restore forbid(unsafe_code)

RustCrypto · Nov 20, 2024 · aca70a0 · aca70a0
1 parent 472a462
commit aca70a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aead/src/lib.rs b/aead/src/lib.rs
@@ -5,7 +5,7 @@
     html_logo_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg",
     html_favicon_url = "https://raw.githubusercontent.com/RustCrypto/media/8f1a9894/logo.svg"
 )]
-// #![forbid(unsafe_code)]
+#![forbid(unsafe_code)]
 #![warn(
     clippy::unwrap_used,
     // missing_docs,
@@ -169,7 +169,7 @@ pub trait Aead {
         associated_data: &[u8],
         mut buffer: InOutBufReserved<'_, 'out, u8>,
     ) -> Result<&'out mut [u8]> {
-        let (msg, tail) = split_reserved(&mut buffer);
+        let (msg, tail) = buffer.split_reserved();
         let tag_len = Self::TagSize::USIZE;
         let tag_dst = tail.get_mut(..tag_len).ok_or(Error)?;
         let res_len = msg.len() + tag_len;
@@ -459,21 +459,6 @@ pub trait Aead {
     }
 }
 
-// TODO: move to `inout`
-fn split_reserved<'a>(
-    buf: &'a mut InOutBufReserved<'_, '_, u8>,
-) -> (InOutBuf<'a, 'a, u8>, &'a mut [u8]) {
-    let in_len = buf.get_in_len();
-    let out_len = buf.get_out_len();
-    let in_ptr = buf.get_in().as_ptr();
-    let out_ptr = buf.get_out().as_mut_ptr();
-    unsafe {
-        let body = InOutBuf::from_raw(in_ptr, out_ptr, in_len);
-        let tail = core::slice::from_raw_parts_mut(out_ptr.add(in_len), out_len - in_len);
-        (body, tail)
-    }
-}
-
 /// AEAD payloads (message + AAD).
 ///
 /// Combination of a message (plaintext or ciphertext) and