Skip to content

Fixes for 'cargo clippy' and 'rustfmt' issues #283

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 2 commits into from
Apr 2, 2023
Merged

Fixes for 'cargo clippy' and 'rustfmt' issues #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa87c1b
feat: fix clippy warnings
lumag Apr 2, 2023
d776250
feat: apply rustfmt
lumag Apr 2, 2023
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
13 changes: 2 additions & 11 deletions src/oaep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,7 @@ impl fmt::Debug for Oaep {
}

#[inline]
fn encrypt_internal<
'a,
R: CryptoRngCore + ?Sized,
K: PublicKey,
MGF: FnMut(&mut [u8], &mut [u8]) -> (),
>(
fn encrypt_internal<R: CryptoRngCore + ?Sized, K: PublicKey, MGF: FnMut(&mut [u8], &mut [u8])>(
rng: &mut R,
pub_key: &K,
msg: &[u8],
Expand Down Expand Up @@ -395,11 +390,7 @@ fn decrypt_digest<
/// `rng` is given. It returns one or zero in valid that indicates whether the
/// plaintext was correctly structured.
#[inline]
fn decrypt_inner<
R: CryptoRngCore + ?Sized,
SK: PrivateKey,
MGF: FnMut(&mut [u8], &mut [u8]) -> (),
>(
fn decrypt_inner<R: CryptoRngCore + ?Sized, SK: PrivateKey, MGF: FnMut(&mut [u8], &mut [u8])>(
rng: Option<&mut R>,
priv_key: &SK,
ciphertext: &[u8],
Expand Down
17 changes: 11 additions & 6 deletions src/pss.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ pub(crate) fn verify<PK: PublicKey>(
let key_len = pub_key.size();
let mut em = pub_key.raw_encryption_primitive(sig, key_len)?;

emsa_pss_verify(hashed, &mut em[key_len - em_len ..], em_bits, None, digest)
emsa_pss_verify(hashed, &mut em[key_len - em_len..], em_bits, None, digest)
}

pub(crate) fn verify_digest<PK, D>(pub_key: &PK, hashed: &[u8], sig: &[u8]) -> Result<()>
Expand All @@ -216,7 +216,7 @@ where
let key_len = pub_key.size();
let mut em = pub_key.raw_encryption_primitive(sig, key_len)?;

emsa_pss_verify_digest::<D>(hashed, &mut em[key_len - em_len ..], em_bits, None)
emsa_pss_verify_digest::<D>(hashed, &mut em[key_len - em_len..], em_bits, None)
}

/// SignPSS calculates the signature of hashed using RSASSA-PSS.
Expand All @@ -234,7 +234,7 @@ pub(crate) fn sign<T: CryptoRngCore, SK: PrivateKey>(
) -> Result<Vec<u8>> {
let salt = generate_salt(rng, priv_key, salt_len, digest.output_size());

sign_pss_with_salt(blind.then(|| rng), priv_key, hashed, &salt, digest)
sign_pss_with_salt(blind.then_some(rng), priv_key, hashed, &salt, digest)
}

pub(crate) fn sign_digest<
Expand All @@ -250,7 +250,7 @@ pub(crate) fn sign_digest<
) -> Result<Vec<u8>> {
let salt = generate_salt(rng, priv_key, salt_len, <D as Digest>::output_size());

sign_pss_with_salt_digest::<_, _, D>(blind.then(|| rng), priv_key, hashed, &salt)
sign_pss_with_salt_digest::<_, _, D>(blind.then_some(rng), priv_key, hashed, &salt)
}

fn generate_salt<T: CryptoRngCore + ?Sized, SK: PrivateKey>(
Expand All @@ -261,7 +261,7 @@ fn generate_salt<T: CryptoRngCore + ?Sized, SK: PrivateKey>(
) -> Vec<u8> {
let em_bits = priv_key.n().bits() - 1;
let em_len = (em_bits + 7) / 8;
let salt_len = salt_len.unwrap_or_else(|| em_len - 2 - digest_size);
let salt_len = salt_len.unwrap_or(em_len - 2 - digest_size);

let mut salt = vec![0; salt_len];
rng.fill_bytes(&mut salt[..]);
Expand Down Expand Up @@ -485,7 +485,12 @@ fn emsa_pss_verify_pre<'a>(
// 6. If the leftmost 8 * em_len - em_bits bits of the leftmost octet in
// maskedDB are not all equal to zero, output "inconsistent" and
// stop.
if db[0] & (0xFF_u8.checked_shl(8 - (8 * em_len - em_bits) as u32).unwrap_or(0)) != 0 {
if db[0]
& (0xFF_u8
.checked_shl(8 - (8 * em_len - em_bits) as u32)
.unwrap_or(0))
!= 0
{
return Err(Error::Verification);
}

Expand Down