Skip to content

Allow passing None as FEC and hash device when formatting as VERITY #461

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

Merged
jbaublitz merged 1 commit into from
Dec 16, 2025
Merged

Allow passing None as FEC and hash device when formatting as VERITY #461

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
38 changes: 28 additions & 10 deletions src/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,9 @@ pub struct CryptParamsVerityRef<'a> {
#[allow(dead_code)]
data_device_cstring: CString,
#[allow(dead_code)]
hash_device_cstring: CString,
hash_device_cstring: Option<CString>,
#[allow(dead_code)]
fec_device_cstring: CString,
fec_device_cstring: Option<CString>,
}

/// Parameters specific to Verity
Expand All @@ -282,9 +282,9 @@ pub struct CryptParamsVerity {
#[allow(missing_docs)]
pub data_device: PathBuf,
#[allow(missing_docs)]
pub hash_device: PathBuf,
pub hash_device: Option<PathBuf>,
#[allow(missing_docs)]
pub fec_device: PathBuf,
pub fec_device: Option<PathBuf>,
#[allow(missing_docs)]
pub salt: Vec<u8>,
#[allow(missing_docs)]
Expand Down Expand Up @@ -312,8 +312,14 @@ impl<'a> TryFrom<&'a libcryptsetup_rs_sys::crypt_params_verity> for CryptParamsV
Ok(CryptParamsVerity {
hash_name: from_str_ptr_to_owned!(v.hash_name)?,
data_device: PathBuf::from(from_str_ptr_to_owned!(v.data_device)?),
hash_device: PathBuf::from(from_str_ptr_to_owned!(v.hash_device)?),
fec_device: PathBuf::from(from_str_ptr_to_owned!(v.fec_device)?),
hash_device: match ptr_to_option!(v.hash_device) {
Some(s) => Some(PathBuf::from(from_str_ptr_to_owned!(s)?)),
None => None,
},
fec_device: match ptr_to_option!(v.fec_device) {
Some(s) => Some(PathBuf::from(from_str_ptr_to_owned!(s)?)),
None => None,
},
salt: Vec::from(unsafe {
std::slice::from_raw_parts(v.salt.cast::<u8>(), v.salt_size as usize)
}),
Expand All @@ -335,14 +341,26 @@ impl<'a> TryInto<CryptParamsVerityRef<'a>> for &'a CryptParamsVerity {
fn try_into(self) -> Result<CryptParamsVerityRef<'a>, Self::Error> {
let hash_name_cstring = to_cstring!(self.hash_name)?;
let data_device_cstring = path_to_cstring!(self.data_device)?;
let hash_device_cstring = path_to_cstring!(self.hash_device)?;
let fec_device_cstring = path_to_cstring!(self.fec_device)?;
let hash_device_cstring = match self.hash_device {
Some(ref hash_device) => Some(path_to_cstring!(hash_device)?),
None => None,
};
let fec_device_cstring = match self.fec_device {
Some(ref fec_device) => Some(path_to_cstring!(fec_device)?),
None => None,
};
Ok(CryptParamsVerityRef {
inner: libcryptsetup_rs_sys::crypt_params_verity {
hash_name: hash_name_cstring.as_ptr(),
data_device: data_device_cstring.as_ptr(),
hash_device: hash_device_cstring.as_ptr(),
fec_device: fec_device_cstring.as_ptr(),
hash_device: hash_device_cstring
.as_ref()
.map(|hd| hd.as_ptr())
.unwrap_or(ptr::null()),
fec_device: fec_device_cstring
.as_ref()
.map(|fd| fd.as_ptr())
.unwrap_or(ptr::null()),
salt: self.salt.as_ptr().cast::<libc::c_char>(),
salt_size: self.salt.len() as u32,
hash_type: self.hash_type,
Expand Down