promote sha1 to a feature

Eugeny · Eugeny · commit dcf47c98d314 · 2025-04-19T17:32:02.000+02:00
diff --git a/ssh-key/src/signature.rs b/ssh-key/src/signature.rs
@@ -672,9 +672,9 @@ impl Signer<Signature> for (&RsaKeypair, Option<HashAlg>) {
             Some(HashAlg::Sha256) => {
                 rsa::pkcs1v15::SigningKey::<Sha256>::try_from(self.0)?.try_sign(message)
             }
-            #[cfg(feature = "rsa-sha1")]
+            #[cfg(all(feature = "rsa", feature = "sha1"))]
             None => rsa::pkcs1v15::SigningKey::<Sha1>::try_from(self.0)?.try_sign(message),
-            #[cfg(not(feature = "rsa-sha1"))]
+            #[cfg(not(all(feature = "rsa", feature = "sha1")))]
             None => return Err(Algorithm::Rsa { hash: None }.unsupported_error().into()),
         }
         .map_err(|_| signature::Error::new())?;

Original file line number	Diff line number	Diff line change
`@@ -672,9 +672,9 @@ impl Signer<Signature> for (&RsaKeypair, Option<HashAlg>) {`
`672`	`672`	`Some(HashAlg::Sha256) => {`
`673`	`673`	`rsa::pkcs1v15::SigningKey::<Sha256>::try_from(self.0)?.try_sign(message)`
`674`	`674`	`}`
`675`		`- #[cfg(feature = "rsa-sha1")]`
	`675`	`+ #[cfg(all(feature = "rsa", feature = "sha1"))]`
`676`	`676`	`None => rsa::pkcs1v15::SigningKey::<Sha1>::try_from(self.0)?.try_sign(message),`
`677`		`- #[cfg(not(feature = "rsa-sha1"))]`
	`677`	`+ #[cfg(not(all(feature = "rsa", feature = "sha1")))]`
`678`	`678`	`None => return Err(Algorithm::Rsa { hash: None }.unsupported_error().into()),`
`679`	`679`	`}`
`680`	`680`	`.map_err(\|_\| signature::Error::new())?;`