Skip to content

Commit 85ad08a

Browse files
Rust wrapper: avoid as_ptr() to *mut u8 casts
Fixes F-1065.
1 parent 884b882 commit 85ad08a

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

  • wrapper/rust/wolfssl-wolfcrypt/src

wrapper/rust/wolfssl-wolfcrypt/src/aes.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2775,13 +2775,12 @@ impl XTSStream {
27752775
/// library return code on failure.
27762776
pub fn encrypt_update(&mut self, din: &[u8], dout: &mut [u8]) -> Result<(), i32> {
27772777
let in_size = crate::buffer_len_to_u32(din.len())?;
2778-
let out_ptr = dout.as_ptr() as *mut u8;
27792778
let out_size = crate::buffer_len_to_u32(dout.len())?;
27802779
if in_size != out_size {
27812780
return Err(sys::wolfCrypt_ErrorCodes_BAD_FUNC_ARG);
27822781
}
27832782
let rc = unsafe {
2784-
sys::wc_AesXtsEncryptUpdate(&mut self.ws_xtsaes, out_ptr,
2783+
sys::wc_AesXtsEncryptUpdate(&mut self.ws_xtsaes, dout.as_mut_ptr(),
27852784
din.as_ptr(), in_size, &mut self.ws_xtsaesstreamdata)
27862785
};
27872786
if rc != 0 {
@@ -2809,13 +2808,12 @@ impl XTSStream {
28092808
/// library return code on failure.
28102809
pub fn encrypt_final(&mut self, din: &[u8], dout: &mut [u8]) -> Result<(), i32> {
28112810
let in_size = crate::buffer_len_to_u32(din.len())?;
2812-
let out_ptr = dout.as_ptr() as *mut u8;
28132811
let out_size = crate::buffer_len_to_u32(dout.len())?;
28142812
if in_size != out_size {
28152813
return Err(sys::wolfCrypt_ErrorCodes_BAD_FUNC_ARG);
28162814
}
28172815
let rc = unsafe {
2818-
sys::wc_AesXtsEncryptFinal(&mut self.ws_xtsaes, out_ptr,
2816+
sys::wc_AesXtsEncryptFinal(&mut self.ws_xtsaes, dout.as_mut_ptr(),
28192817
din.as_ptr(), in_size, &mut self.ws_xtsaesstreamdata)
28202818
};
28212819
if rc != 0 {
@@ -2844,13 +2842,12 @@ impl XTSStream {
28442842
/// library return code on failure.
28452843
pub fn decrypt_update(&mut self, din: &[u8], dout: &mut [u8]) -> Result<(), i32> {
28462844
let in_size = crate::buffer_len_to_u32(din.len())?;
2847-
let out_ptr = dout.as_ptr() as *mut u8;
28482845
let out_size = crate::buffer_len_to_u32(dout.len())?;
28492846
if in_size != out_size {
28502847
return Err(sys::wolfCrypt_ErrorCodes_BAD_FUNC_ARG);
28512848
}
28522849
let rc = unsafe {
2853-
sys::wc_AesXtsDecryptUpdate(&mut self.ws_xtsaes, out_ptr,
2850+
sys::wc_AesXtsDecryptUpdate(&mut self.ws_xtsaes, dout.as_mut_ptr(),
28542851
din.as_ptr(), in_size, &mut self.ws_xtsaesstreamdata)
28552852
};
28562853
if rc != 0 {
@@ -2878,13 +2875,12 @@ impl XTSStream {
28782875
/// library return code on failure.
28792876
pub fn decrypt_final(&mut self, din: &[u8], dout: &mut [u8]) -> Result<(), i32> {
28802877
let in_size = crate::buffer_len_to_u32(din.len())?;
2881-
let out_ptr = dout.as_ptr() as *mut u8;
28822878
let out_size = crate::buffer_len_to_u32(dout.len())?;
28832879
if in_size != out_size {
28842880
return Err(sys::wolfCrypt_ErrorCodes_BAD_FUNC_ARG);
28852881
}
28862882
let rc = unsafe {
2887-
sys::wc_AesXtsDecryptFinal(&mut self.ws_xtsaes, out_ptr,
2883+
sys::wc_AesXtsDecryptFinal(&mut self.ws_xtsaes, dout.as_mut_ptr(),
28882884
din.as_ptr(), in_size, &mut self.ws_xtsaesstreamdata)
28892885
};
28902886
if rc != 0 {

0 commit comments

Comments
 (0)