cleanup: simplify SignatureConfig creation (#559)

hko-s · web-flow · commit 9c1c3c084574 · 2025-05-26T17:24:49.000+02:00
diff --git a/src/composed/cleartext.rs b/src/composed/cleartext.rs
@@ -66,22 +66,14 @@ where {
     where
         R: rand::Rng + rand::CryptoRng,
     {
-        let algorithm = key.algorithm();
-        let hash_algorithm = key.hash_alg();
         let hashed_subpackets = vec![
             Subpacket::regular(SubpacketData::IssuerFingerprint(key.fingerprint()))?,
             Subpacket::regular(SubpacketData::SignatureCreationTime(
                 chrono::Utc::now().trunc_subsecs(0),
             ))?,
         ];
 
-        let mut config = match key.version() {
-            KeyVersion::V4 => SignatureConfig::v4(SignatureType::Text, algorithm, hash_algorithm),
-            KeyVersion::V6 => {
-                SignatureConfig::v6(rng, SignatureType::Text, algorithm, hash_algorithm)?
-            }
-            v => bail!("unsupported key version {:?}", v),
-        };
+        let mut config = SignatureConfig::from_key(rng, key, SignatureType::Text)?;
         config.hashed_subpackets = hashed_subpackets;
 
         // If the version of the issuer is greater than 4, this subpacket MUST NOT be included in
diff --git a/src/composed/key/shared.rs b/src/composed/key/shared.rs
@@ -6,7 +6,7 @@ use smallvec::SmallVec;
 use crate::{
     composed::SignedKeyDetails,
     crypto::{aead::AeadAlgorithm, hash::HashAlgorithm, sym::SymmetricKeyAlgorithm},
-    errors::{unsupported_err, Result},
+    errors::Result,
     packet::{
         Features, KeyFlags, PacketTrait, SignatureConfig, SignatureType, Subpacket, SubpacketData,
         UserAttribute, UserId,
@@ -121,19 +121,7 @@ impl KeyDetails {
         let mut users = vec![];
 
         if let Some(primary_user_id) = self.primary_user_id {
-            let mut config = match key.version() {
-                KeyVersion::V4 => {
-                    SignatureConfig::v4(SignatureType::CertGeneric, key.algorithm(), key.hash_alg())
-                }
-                KeyVersion::V6 => SignatureConfig::v6(
-                    &mut rng,
-                    SignatureType::CertGeneric,
-                    key.algorithm(),
-                    key.hash_alg(),
-                )?,
-                v => unsupported_err!("unsupported key version: {:?}", v),
-            };
-
+            let mut config = SignatureConfig::from_key(&mut rng, key, SignatureType::CertGeneric)?;
             config.hashed_subpackets = match key.version() {
                 KeyVersion::V6 => basic_subpackets()?,
                 _ => subpackets_with_metadata()?,
@@ -164,20 +152,8 @@ impl KeyDetails {
             self.non_primary_user_ids
                 .into_iter()
                 .map(|id| {
-                    let mut config = match key.version() {
-                        KeyVersion::V4 => SignatureConfig::v4(
-                            SignatureType::CertGeneric,
-                            key.algorithm(),
-                            key.hash_alg(),
-                        ),
-                        KeyVersion::V6 => SignatureConfig::v6(
-                            &mut rng,
-                            SignatureType::CertGeneric,
-                            key.algorithm(),
-                            key.hash_alg(),
-                        )?,
-                        v => unsupported_err!("unsupported key version: {:?}", v),
-                    };
+                    let mut config =
+                        SignatureConfig::from_key(&mut rng, key, SignatureType::CertGeneric)?;
 
                     config.hashed_subpackets = match key.version() {
                         KeyVersion::V6 => basic_subpackets()?,
diff --git a/src/packet/key/public.rs b/src/packet/key/public.rs
@@ -161,7 +161,7 @@ impl PublicSubkey {
     /// Produce a Subkey Binding Signature (Type ID 0x18), to bind this subkey to a primary key
     pub fn sign<R: CryptoRng + Rng, K, P>(
         &self,
-        mut rng: R,
+        rng: R,
         primary_sec_key: &K,
         primary_pub_key: &P,
         key_pw: &Password,
@@ -172,20 +172,8 @@ impl PublicSubkey {
         K: SecretKeyTrait,
         P: PublicKeyTrait + Serialize,
     {
-        let mut config = match primary_sec_key.version() {
-            KeyVersion::V4 => SignatureConfig::v4(
-                SignatureType::SubkeyBinding,
-                primary_sec_key.algorithm(),
-                primary_sec_key.hash_alg(),
-            ),
-            KeyVersion::V6 => SignatureConfig::v6(
-                &mut rng,
-                SignatureType::SubkeyBinding,
-                primary_sec_key.algorithm(),
-                primary_sec_key.hash_alg(),
-            )?,
-            v => unsupported_err!("unsupported key version: {:?}", v),
-        };
+        let mut config =
+            SignatureConfig::from_key(rng, primary_sec_key, SignatureType::SubkeyBinding)?;
 
         config.hashed_subpackets = vec![
             Subpacket::regular(SubpacketData::SignatureCreationTime(
@@ -415,14 +403,7 @@ impl PubKeyInner {
     {
         use chrono::SubsecRound;
 
-        let mut config = match key.version() {
-            KeyVersion::V4 => SignatureConfig::v4(sig_type, key.algorithm(), key.hash_alg()),
-            KeyVersion::V6 => {
-                SignatureConfig::v6(&mut rng, sig_type, key.algorithm(), key.hash_alg())?
-            }
-            v => unsupported_err!("unsupported key version: {:?}", v),
-        };
-
+        let mut config = SignatureConfig::from_key(&mut rng, key, sig_type)?;
         config.hashed_subpackets = vec![Subpacket::regular(SubpacketData::SignatureCreationTime(
             chrono::Utc::now().trunc_subsecs(0),
         ))?];
diff --git a/src/packet/key/secret.rs b/src/packet/key/secret.rs
@@ -160,25 +160,14 @@ impl SecretSubkey {
     /// willing to be associated with the primary.
     pub fn sign_primary_key_binding<R: CryptoRng + Rng, P>(
         &self,
-        mut rng: R,
+        rng: R,
         pub_key: &P,
         key_pw: &Password,
     ) -> Result<Signature>
     where
         P: PublicKeyTrait + Serialize,
     {
-        let mut config = match self.version() {
-            KeyVersion::V4 => {
-                SignatureConfig::v4(SignatureType::KeyBinding, self.algorithm(), self.hash_alg())
-            }
-            KeyVersion::V6 => SignatureConfig::v6(
-                &mut rng,
-                SignatureType::KeyBinding,
-                self.algorithm(),
-                self.hash_alg(),
-            )?,
-            v => unsupported_err!("unsupported key version: {:?}", v),
-        };
+        let mut config = SignatureConfig::from_key(rng, self, SignatureType::KeyBinding)?;
 
         config.hashed_subpackets = vec![
             Subpacket::regular(SubpacketData::SignatureCreationTime(
@@ -640,12 +629,7 @@ where
 {
     use chrono::SubsecRound;
 
-    let mut config = match key.version() {
-        KeyVersion::V4 => SignatureConfig::v4(sig_typ, key.algorithm(), key.hash_alg()),
-        KeyVersion::V6 => SignatureConfig::v6(&mut rng, sig_typ, key.algorithm(), key.hash_alg())?,
-        v => unsupported_err!("unsupported key version: {:?}", v),
-    };
-
+    let mut config = SignatureConfig::from_key(&mut rng, key, sig_typ)?;
     config.hashed_subpackets = vec![Subpacket::regular(SubpacketData::SignatureCreationTime(
         chrono::Utc::now().trunc_subsecs(0),
     ))?];
diff --git a/src/packet/signature/config.rs b/src/packet/signature/config.rs
@@ -11,7 +11,7 @@ use crate::{
         hash::{HashAlgorithm, WriteHasher},
         public_key::PublicKeyAlgorithm,
     },
-    errors::{bail, ensure, unimplemented_err, Result},
+    errors::{bail, ensure, unimplemented_err, unsupported_err, Result},
     packet::{
         types::serialize_for_hashing, Signature, SignatureType, SignatureVersion, Subpacket,
         SubpacketData, SubpacketType,
@@ -62,6 +62,18 @@ impl From<&SignatureVersionSpecific> for SignatureVersion {
 }
 
 impl SignatureConfig {
+    pub fn from_key<R: CryptoRng + Rng, K: SecretKeyTrait>(
+        mut rng: R,
+        key: &K,
+        typ: SignatureType,
+    ) -> Result<Self> {
+        match key.version() {
+            KeyVersion::V4 => Ok(SignatureConfig::v4(typ, key.algorithm(), key.hash_alg())),
+            KeyVersion::V6 => SignatureConfig::v6(&mut rng, typ, key.algorithm(), key.hash_alg()),
+            v => unsupported_err!("unsupported key version: {:?}", v),
+        }
+    }
+
     /// Constructor for a v2 SignatureConfig (which represents the data of a v2 OpenPGP signature packet)
     ///
     /// OpenPGP v2 Signatures are historical and not used anymore.
diff --git a/src/packet/user_attribute.rs b/src/packet/user_attribute.rs
@@ -8,7 +8,7 @@ use num_enum::{FromPrimitive, IntoPrimitive};
 use rand::{CryptoRng, Rng};
 
 use crate::{
-    errors::{ensure, ensure_eq, unsupported_err, Result},
+    errors::{ensure, ensure_eq, Result},
     packet::{
         PacketHeader, PacketTrait, Signature, SignatureConfig, SignatureType, Subpacket,
         SubpacketData, SubpacketLength,
@@ -252,21 +252,7 @@ impl UserAttribute {
             Utc::now().trunc_subsecs(0),
         ))?];
 
-        let mut config = match signer.version() {
-            KeyVersion::V4 => SignatureConfig::v4(
-                SignatureType::CertGeneric,
-                signer.algorithm(),
-                signer.hash_alg(),
-            ),
-
-            KeyVersion::V6 => SignatureConfig::v6(
-                &mut rng,
-                SignatureType::CertGeneric,
-                signer.algorithm(),
-                signer.hash_alg(),
-            )?,
-            v => unsupported_err!("unsupported key version: {:?}", v),
-        };
+        let mut config = SignatureConfig::from_key(&mut rng, signer, SignatureType::CertGeneric)?;
 
         config.hashed_subpackets = hashed_subpackets;
         if signer.version() <= KeyVersion::V4 {
diff --git a/src/packet/user_id.rs b/src/packet/user_id.rs
@@ -5,7 +5,7 @@ use chrono::{SubsecRound, Utc};
 use rand::{CryptoRng, Rng};
 
 use crate::{
-    errors::{unsupported_err, Result},
+    errors::Result,
     packet::{
         PacketHeader, PacketTrait, Signature, SignatureConfig, SignatureType, Subpacket,
         SubpacketData,
@@ -106,20 +106,7 @@ impl UserId {
             Utc::now().trunc_subsecs(0),
         ))?];
 
-        let mut config = match signer.version() {
-            KeyVersion::V4 => SignatureConfig::v4(
-                SignatureType::CertGeneric,
-                signer.algorithm(),
-                signer.hash_alg(),
-            ),
-            KeyVersion::V6 => SignatureConfig::v6(
-                &mut rng,
-                SignatureType::CertGeneric,
-                signer.algorithm(),
-                signer.hash_alg(),
-            )?,
-            v => unsupported_err!("unsupported key version: {:?}", v),
-        };
+        let mut config = SignatureConfig::from_key(&mut rng, signer, SignatureType::CertGeneric)?;
 
         config.hashed_subpackets = hashed_subpackets;
         if signer.version() <= KeyVersion::V4 {
