Skip to content

ssh-key: support making RSA-SHA1 signatures #323

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 4 commits into from
Apr 19, 2025
Merged

ssh-key: support making RSA-SHA1 signatures #323

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2c0f51
ssh-key: support making RSA-SHA1 signatures
Eugeny Dec 27, 2024
4954f62
fixed rsa-sha1 signature
Eugeny Jan 3, 2025
80418dc
fmt
Eugeny Jan 6, 2025
dcf47c9
promote sha1 to a feature
Eugeny Mar 27, 2025
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
29 changes: 22 additions & 7 deletions ssh-key/src/signature.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,21 +663,36 @@ impl Verifier<Signature> for EcdsaPublicKey {
}

#[cfg(feature = "rsa")]
impl Signer<Signature> for RsaKeypair {
impl Signer<Signature> for (&RsaKeypair, Option<HashAlg>) {
fn try_sign(&self, message: &[u8]) -> signature::Result<Signature> {
let data = rsa::pkcs1v15::SigningKey::<Sha512>::try_from(self)?
.try_sign(message)
.map_err(|_| signature::Error::new())?;
let data = match self.1 {
Some(HashAlg::Sha512) => {
rsa::pkcs1v15::SigningKey::<Sha512>::try_from(self.0)?.try_sign(message)
}
Some(HashAlg::Sha256) => {
rsa::pkcs1v15::SigningKey::<Sha256>::try_from(self.0)?.try_sign(message)
}
#[cfg(all(feature = "rsa", feature = "sha1"))]
None => rsa::pkcs1v15::SigningKey::<Sha1>::try_from(self.0)?.try_sign(message),
#[cfg(not(all(feature = "rsa", feature = "sha1")))]
None => return Err(Algorithm::Rsa { hash: None }.unsupported_error().into()),
}
.map_err(|_| signature::Error::new())?;

Ok(Signature {
algorithm: Algorithm::Rsa {
hash: Some(HashAlg::Sha512),
},
algorithm: Algorithm::Rsa { hash: self.1 },
data: data.to_vec(),
})
}
}

#[cfg(feature = "rsa")]
impl Signer<Signature> for RsaKeypair {
fn try_sign(&self, message: &[u8]) -> signature::Result<Signature> {
(self, Some(HashAlg::Sha512)).try_sign(message)
}
}

#[cfg(feature = "rsa")]
impl Verifier<Signature> for RsaPublicKey {
fn verify(&self, message: &[u8], signature: &Signature) -> signature::Result<()> {
Expand Down