Skip to content

ctutils: use signed Cmov* trait impls #1282

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
tarcieri merged 1 commit into from
Dec 27, 2025
+10 −41
Merged

ctutils: use signed Cmov* trait impls #1282

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ctutils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ edition = "2024"
rust-version = "1.85"

[dependencies]
cmov = "0.4"
cmov = "0.4.2"

# optional dependencies
subtle = { version = "2", optional = true, default-features = false }
Expand Down
24 changes: 4 additions & 20 deletions ctutils/src/traits/ct_eq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ where
}

// Impl `CtEq` using the `cmov::CmovEq` trait
macro_rules! impl_unsigned_ct_eq_with_cmov {
( $($uint:ty),+ ) => {
macro_rules! impl_ct_eq_with_cmov_eq {
( $($ty:ty),+ ) => {
$(
impl CtEq for $uint {
impl CtEq for $ty {
#[inline]
fn ct_eq(&self, other: &Self) -> Choice {
let mut ret = 0;
Expand All @@ -35,23 +35,7 @@ macro_rules! impl_unsigned_ct_eq_with_cmov {
};
}

// Impl `CtEq` by first casting to unsigned then using the unsigned `CtEq` impls
// TODO(tarcieri): add signed integer support to `cmov`
macro_rules! impl_signed_ct_eq_with_cmov {
( $($int:ty => $uint:ty),+ ) => {
$(
impl CtEq for $int {
#[inline]
fn ct_eq(&self, other: &Self) -> Choice {
(*self as $uint).ct_eq(&(*other as $uint))
}
}
)+
};
}

impl_unsigned_ct_eq_with_cmov!(u8, u16, u32, u64, u128);
impl_signed_ct_eq_with_cmov!(i8 => u8, i16 => u16, i32 => u32, i64 => u64, i128 => u128);
impl_ct_eq_with_cmov_eq!(i8, i16, i32, i64, i128, u8, u16, u32, u64, u128);

#[cfg(any(target_pointer_width = "32", target_pointer_width = "64"))]
impl CtEq for usize {
Expand Down
25 changes: 5 additions & 20 deletions ctutils/src/traits/ct_select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,18 @@ pub trait CtSelect: Sized {
}

// Impl `CtSelect` using the `cmov::Cmov` trait
macro_rules! impl_unsigned_ct_select_with_cmov {
( $($uint:ty),+ ) => {
macro_rules! impl_ct_select_with_cmov {
( $($ty:ty),+ ) => {
$(
impl CtSelect for $uint {
impl CtSelect for $ty {
#[inline]
fn ct_select(&self, other: &Self, choice: Choice) -> Self {
let mut ret = *self;
ret.ct_assign(other, choice);
ret
}

#[inline]
fn ct_assign(&mut self, other: &Self, choice: Choice) {
self.cmovnz(other, choice.into());
}
Expand All @@ -44,23 +45,7 @@ macro_rules! impl_unsigned_ct_select_with_cmov {
};
}

// Impl `CtSelect` by first casting to unsigned then using the unsigned `CtSelect` impls
// TODO(tarcieri): add signed integer support to `cmov`
macro_rules! impl_signed_ct_select_with_cmov {
( $($int:ty => $uint:ty),+ ) => {
$(
impl CtSelect for $int {
#[inline]
fn ct_select(&self, other: &Self, choice: Choice) -> Self {
(*self as $uint).ct_select(&(*other as $uint), choice) as Self
}
}
)+
};
}

impl_unsigned_ct_select_with_cmov!(u8, u16, u32, u64, u128);
impl_signed_ct_select_with_cmov!(i8 => u8, i16 => u16, i32 => u32, i64 => u64, i128 => u128);
impl_ct_select_with_cmov!(i8, i16, i32, i64, i128, u8, u16, u32, u64, u128);

#[cfg(any(target_pointer_width = "32", target_pointer_width = "64"))]
impl CtSelect for usize {
Expand Down