Skip to content

chore: clean up 17 clippy warnings on stable (#16) #21

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
rubenhensen merged 1 commit into from
May 5, 2026
Merged

chore: clean up 17 clippy warnings on stable (#16) #21

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
37 changes: 13 additions & 24 deletions src/ibe/waters.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,33 +170,30 @@ impl IBE for Waters {

/// Decrypt ciphertext to a message using a user secret key.
fn decrypt(usk: &UserSecretKey, c: &CipherText) -> Msg {
let m = c.c1
+ multi_miller_loop(&[
(&c.c3, &G2Prepared::from(usk.d2)),
(&-usk.d1, &G2Prepared::from(c.c2)),
])
.final_exponentiation();

m
c.c1 + multi_miller_loop(&[
(&c.c3, &G2Prepared::from(usk.d2)),
(&-usk.d1, &G2Prepared::from(c.c2)),
])
.final_exponentiation()
}
}

impl Parameters {
pub fn to_bytes(&self) -> [u8; PARAMETERSIZE] {
pub fn to_bytes(self) -> [u8; PARAMETERSIZE] {
let mut res = [0u8; PARAMETERSIZE];
for i in 0..CHUNKS {
*array_mut_ref![&mut res, i * 48, 48] = self.0[i].to_compressed();
for (i, p) in self.0.iter().enumerate() {
*array_mut_ref![&mut res, i * 48, 48] = p.to_compressed();
}
res
}

pub fn from_bytes(bytes: &[u8; PARAMETERSIZE]) -> CtOption<Self> {
let mut res = [G1Affine::default(); CHUNKS];
let mut is_some = Choice::from(1u8);
for i in 0..CHUNKS {
for (i, slot) in res.iter_mut().enumerate() {
is_some &= G1Affine::from_compressed(array_ref![bytes, i * 48, 48])
.map(|s| {
res[i] = s;
*slot = s;
})
.is_some();
}
Expand All @@ -208,19 +205,15 @@ impl ConditionallySelectable for Parameters {
fn conditional_select(a: &Self, b: &Self, choice: Choice) -> Self {
let mut res = [G1Affine::default(); CHUNKS];
for (i, (ai, bi)) in a.0.iter().zip(b.0.iter()).enumerate() {
res[i] = G1Affine::conditional_select(&ai, &bi, choice);
res[i] = G1Affine::conditional_select(ai, bi, choice);
}
Parameters(res)
}
}

impl Clone for Parameters {
fn clone(&self) -> Self {
let mut res = [G1Affine::default(); CHUNKS];
for (src, dst) in self.0.iter().zip(res.as_mut().iter_mut()) {
*dst = *src;
}
Parameters(res)
*self
}
}

Expand Down Expand Up @@ -254,11 +247,7 @@ impl Derive for Identity {

impl Clone for Identity {
fn clone(&self) -> Self {
let mut res = [u8::default(); HASH_BYTE_LEN];
for (src, dst) in self.0.iter().zip(res.as_mut().iter_mut()) {
*dst = *src;
}
Identity(res)
*self
}
}

Expand Down
25 changes: 11 additions & 14 deletions src/ibe/waters_naccache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,43 +173,40 @@ impl IBE for WatersNaccache {

/// Decrypt ciphertext to a message using a user secret key.
fn decrypt(usk: &UserSecretKey, c: &CipherText) -> Msg {
let m = c.c1
+ multi_miller_loop(&[
(&usk.d2, &G2Prepared::from(c.c3)),
(&-c.c2, &G2Prepared::from(usk.d1)),
])
.final_exponentiation();

m
c.c1 + multi_miller_loop(&[
(&usk.d2, &G2Prepared::from(c.c3)),
(&-c.c2, &G2Prepared::from(usk.d1)),
])
.final_exponentiation()
}
}

impl ConditionallySelectable for Parameters {
fn conditional_select(a: &Self, b: &Self, choice: Choice) -> Self {
let mut res = [G2Affine::default(); CHUNKS];
for (i, (ai, bi)) in a.0.iter().zip(b.0.iter()).enumerate() {
res[i] = G2Affine::conditional_select(&ai, &bi, choice);
res[i] = G2Affine::conditional_select(ai, bi, choice);
}
Parameters(res)
}
}

impl Parameters {
pub fn to_bytes(&self) -> [u8; PARAMETERSIZE] {
pub fn to_bytes(self) -> [u8; PARAMETERSIZE] {
let mut res = [0u8; PARAMETERSIZE];
for i in 0..CHUNKS {
*array_mut_ref![&mut res, i * 96, 96] = self.0[i].to_compressed();
for (i, p) in self.0.iter().enumerate() {
*array_mut_ref![&mut res, i * 96, 96] = p.to_compressed();
}
res
}

pub fn from_bytes(bytes: &[u8; PARAMETERSIZE]) -> CtOption<Self> {
let mut res = [G2Affine::default(); CHUNKS];
let mut is_some = Choice::from(1u8);
for i in 0..CHUNKS {
for (i, slot) in res.iter_mut().enumerate() {
is_some &= G2Affine::from_compressed(array_ref![bytes, i * 96, 96])
.map(|s| {
res[i] = s;
*slot = s;
})
.is_some();
}
Expand Down
18 changes: 7 additions & 11 deletions src/kem/kiltz_vahlis_one.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,22 +175,22 @@ impl IBKEM for KV1 {
}

impl HashParameters {
pub fn to_bytes(&self) -> [u8; HASH_PARAMETER_SIZE] {
pub fn to_bytes(self) -> [u8; HASH_PARAMETER_SIZE] {
let mut res = [0u8; HASH_PARAMETER_SIZE];
for i in 0..N {
*array_mut_ref![&mut res, i * 48, 48] = self.0[i].to_compressed();
for (i, p) in self.0.iter().enumerate() {
*array_mut_ref![&mut res, i * 48, 48] = p.to_compressed();
}
res
}

pub fn from_bytes(bytes: &[u8; HASH_PARAMETER_SIZE]) -> CtOption<Self> {
let mut res = [G1Affine::default(); N];
let mut is_some = Choice::from(1u8);
for i in 0..N {
for (i, slot) in res.iter_mut().enumerate() {
// See comment in PublicKey::from_bytes on cofactor.
is_some &= G1Affine::from_compressed_unchecked(array_ref![bytes, i * 48, 48])
.map(|s| {
res[i] = s;
*slot = s;
})
.is_some();
}
Expand All @@ -202,7 +202,7 @@ impl ConditionallySelectable for HashParameters {
fn conditional_select(a: &Self, b: &Self, choice: Choice) -> Self {
let mut res = [G1Affine::default(); N];
for (i, (ai, bi)) in a.0.iter().zip(b.0.iter()).enumerate() {
res[i] = G1Affine::conditional_select(&ai, &bi, choice);
res[i] = G1Affine::conditional_select(ai, bi, choice);
}
HashParameters(res)
}
Expand All @@ -216,11 +216,7 @@ impl PartialEq for HashParameters {

impl Clone for HashParameters {
fn clone(&self) -> Self {
let mut res = [G1Affine::default(); N];
for (src, dst) in self.0.iter().zip(res.as_mut().iter_mut()) {
*dst = *src;
}
Self(res)
*self
}
}

Expand Down
Loading