rpgp
diff --git a/‎src/composed/key/builder.rs
Copy file name to clipboard
+18-18Lines changed: 18 additions & 18 deletions b/‎src/composed/key/builder.rs
Copy file name to clipboard
+18-18Lines changed: 18 additions & 18 deletions
diff --git a/‎src/composed/key/public.rs
Copy file name to clipboard
+35-8Lines changed: 35 additions & 8 deletions b/‎src/composed/key/public.rs
Copy file name to clipboard
+35-8Lines changed: 35 additions & 8 deletions
diff --git a/‎src/composed/key/secret.rs
Copy file name to clipboard
+1-30Lines changed: 1 addition & 30 deletions b/‎src/composed/key/secret.rs
Copy file name to clipboard
+1-30Lines changed: 1 addition & 30 deletions
diff --git a/‎src/composed/message/decrypt.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎src/composed/message/decrypt.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/composed/message/types.rs
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions b/‎src/composed/message/types.rs
Copy file name to clipboard
+2-3Lines changed: 2 additions & 3 deletions
@@ -171,17 +171,17 @@ impl SecretKeyParams {
         let s2k = self.s2k.unwrap_or_else(|| S2kParams::new_default(&mut rng));
         let (public_params, secret_params) =
             self.key_type.generate_with_rng(&mut rng, passphrase, s2k)?;
-        let primary_key = packet::SecretKey {
-            details: packet::PublicKey {
-                packet_version: self.packet_version,
-                version: self.version,
-                algorithm: self.key_type.to_alg(),
-                created_at: self.created_at,
-                expiration: self.expiration.map(|v| v.as_secs() as u16),
+        let primary_key = packet::SecretKey::new(
+            packet::PublicKey::new(
+                self.packet_version,
+                self.version,
+                self.key_type.to_alg(),
+                self.created_at,
+                self.expiration.map(|v| v.as_secs() as u16),
                 public_params,
-            },
+            )?,
             secret_params,
-        };
+        );
 
         let mut keyflags = KeyFlags::default();
         keyflags.set_certify(self.can_certify);
@@ -222,17 +222,17 @@ impl SecretKeyParams {
                     keyflags.set_authentication(subkey.can_authenticate);
 
                     Ok(SecretSubkey::new(
-                        packet::SecretSubkey {
-                            details: packet::PublicSubkey {
-                                packet_version: subkey.packet_version,
-                                version: subkey.version,
-                                algorithm: subkey.key_type.to_alg(),
-                                created_at: subkey.created_at,
-                                expiration: subkey.expiration.map(|v| v.as_secs() as u16),
+                        packet::SecretSubkey::new(
+                            packet::PublicSubkey::new(
+                                subkey.packet_version,
+                                subkey.version,
+                                subkey.key_type.to_alg(),
+                                subkey.created_at,
+                                subkey.expiration.map(|v| v.as_secs() as u16),
                                 public_params,
-                            },
+                            )?,
                             secret_params,
-                        },
+                        ),
                         keyflags,
                     ))
                 })
 
@@ -11,7 +11,7 @@ use crate::errors::Result;
 use crate::packet::{
     self, KeyFlags, SignatureConfigBuilder, SignatureType, Subpacket, SubpacketData,
 };
-use crate::types::{KeyId, KeyTrait, Mpi, PublicKeyTrait, SecretKeyTrait};
+use crate::types::{KeyId, Mpi, PublicKeyTrait, PublicParams, SecretKeyTrait};
 
 /// User facing interface to work with a public key.
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -60,7 +60,11 @@ impl PublicKey {
     }
 }
 
-impl KeyTrait for PublicKey {
+impl PublicKeyTrait for PublicKey {
+    fn version(&self) -> crate::types::KeyVersion {
+        self.primary_key.version()
+    }
+
     fn fingerprint(&self) -> Vec<u8> {
         self.primary_key.fingerprint()
     }
@@ -72,9 +76,6 @@ impl KeyTrait for PublicKey {
     fn algorithm(&self) -> PublicKeyAlgorithm {
         self.primary_key.algorithm()
     }
-}
-
-impl PublicKeyTrait for PublicKey {
     fn verify_signature(&self, hash: HashAlgorithm, data: &[u8], sig: &[Mpi]) -> Result<()> {
         self.primary_key.verify_signature(hash, data, sig)
     }
@@ -86,6 +87,18 @@ impl PublicKeyTrait for PublicKey {
     fn to_writer_old(&self, writer: &mut impl io::Write) -> Result<()> {
         self.primary_key.to_writer_old(writer)
     }
+
+    fn public_params(&self) -> &PublicParams {
+        self.primary_key.public_params()
+    }
+
+    fn created_at(&self) -> &chrono::DateTime<chrono::Utc> {
+        self.primary_key.created_at()
+    }
+
+    fn expiration(&self) -> Option<u16> {
+        self.primary_key.expiration()
+    }
 }
 
 impl PublicSubkey {
@@ -125,7 +138,11 @@ impl PublicSubkey {
     }
 }
 
-impl KeyTrait for PublicSubkey {
+impl PublicKeyTrait for PublicSubkey {
+    fn version(&self) -> crate::types::KeyVersion {
+        self.key.version()
+    }
+
     fn fingerprint(&self) -> Vec<u8> {
         self.key.fingerprint()
     }
@@ -137,9 +154,7 @@ impl KeyTrait for PublicSubkey {
     fn algorithm(&self) -> PublicKeyAlgorithm {
         self.key.algorithm()
     }
-}
 
-impl PublicKeyTrait for PublicSubkey {
     fn verify_signature(&self, hash: HashAlgorithm, data: &[u8], sig: &[Mpi]) -> Result<()> {
         self.key.verify_signature(hash, data, sig)
     }
@@ -151,4 +166,16 @@ impl PublicKeyTrait for PublicSubkey {
     fn to_writer_old(&self, writer: &mut impl io::Write) -> Result<()> {
         self.key.to_writer_old(writer)
     }
+
+    fn public_params(&self) -> &PublicParams {
+        self.key.public_params()
+    }
+
+    fn created_at(&self) -> &chrono::DateTime<chrono::Utc> {
+        self.key.created_at()
+    }
+
+    fn expiration(&self) -> Option<u16> {
+        self.key.expiration()
+    }
 }
@@ -2,12 +2,11 @@ use chrono::SubsecRound;
 use smallvec::SmallVec;
 
 use crate::composed::{KeyDetails, PublicSubkey, SignedSecretKey, SignedSecretSubKey};
-use crate::crypto::public_key::PublicKeyAlgorithm;
 use crate::errors::Result;
 use crate::packet::{
     self, KeyFlags, SignatureConfigBuilder, SignatureType, Subpacket, SubpacketData,
 };
-use crate::types::{KeyId, KeyTrait, SecretKeyTrait};
+use crate::types::SecretKeyTrait;
 
 /// User facing interface to work with a secret key.
 #[derive(Debug, PartialEq, Eq, Clone)]
@@ -65,20 +64,6 @@ impl SecretKey {
     }
 }
 
-impl KeyTrait for SecretKey {
-    fn fingerprint(&self) -> Vec<u8> {
-        self.primary_key.fingerprint()
-    }
-
-    fn key_id(&self) -> KeyId {
-        self.primary_key.key_id()
-    }
-
-    fn algorithm(&self) -> PublicKeyAlgorithm {
-        self.primary_key.algorithm()
-    }
-}
-
 impl SecretSubkey {
     pub fn new(key: packet::SecretSubkey, keyflags: KeyFlags) -> Self {
         SecretSubkey { key, keyflags }
@@ -114,17 +99,3 @@ impl SecretSubkey {
         Ok(SignedSecretSubKey { key, signatures })
     }
 }
-
-impl KeyTrait for SecretSubkey {
-    fn fingerprint(&self) -> Vec<u8> {
-        self.key.fingerprint()
-    }
-
-    fn key_id(&self) -> KeyId {
-        self.key.key_id()
-    }
-
-    fn algorithm(&self) -> PublicKeyAlgorithm {
-        self.key.algorithm()
-    }
-}
@@ -1,13 +1,13 @@
 use crate::crypto::sym::SymmetricKeyAlgorithm;
 use crate::errors::Result;
 use crate::packet::SymKeyEncryptedSessionKey;
-use crate::types::{KeyTrait, Mpi, SecretKeyRepr, SecretKeyTrait};
+use crate::types::{Mpi, SecretKeyRepr, SecretKeyTrait};
 
 /// Decrypts session key using secret key.
 pub fn decrypt_session_key<F, L>(locked_key: &L, key_pw: F, mpis: &[Mpi]) -> Result<PlainSessionKey>
 where
     F: FnOnce() -> String,
-    L: SecretKeyTrait<Unlocked = SecretKeyRepr> + KeyTrait,
+    L: SecretKeyTrait<Unlocked = SecretKeyRepr>,
 {
     debug!("decrypt session key");
 
 
@@ -22,8 +22,7 @@ use crate::packet::{
 };
 use crate::ser::Serialize;
 use crate::types::{
-    CompressionAlgorithm, KeyId, KeyTrait, KeyVersion, PublicKeyTrait, SecretKeyTrait, StringToKey,
-    Tag,
+    CompressionAlgorithm, KeyId, KeyVersion, PublicKeyTrait, SecretKeyTrait, StringToKey, Tag,
 };
 
 /// An [OpenPGP message](https://tools.ietf.org/html/rfc4880.html#section-11.3)
@@ -561,7 +560,7 @@ impl Message {
                                 "{:?}",
                                 key.secret_subkeys
                                     .iter()
-                                    .map(KeyTrait::key_id)
+                                    .map(PublicKeyTrait::key_id)
                                     .collect::<Vec<_>>()
                             );