diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-01-21 16:32:07 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-01-21 16:38:09 +0100 |
commit | 0a90c63dd3fe0beaa905d1c28924513d79e48c89 (patch) | |
tree | ae848fd45ce2dd33c237e1781ffcf84a3aac7fb2 /openpgp/src/serialize/cert.rs | |
parent | ea15543a1bebb1e9c985ac85a348e8ae3d5a7cb3 (diff) |
openpgp: Avoid use of Cert::primary_key.
Diffstat (limited to 'openpgp/src/serialize/cert.rs')
-rw-r--r-- | openpgp/src/serialize/cert.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/openpgp/src/serialize/cert.rs b/openpgp/src/serialize/cert.rs index c749c28d..c3ec4f6d 100644 --- a/openpgp/src/serialize/cert.rs +++ b/openpgp/src/serialize/cert.rs @@ -325,15 +325,12 @@ impl<'a> TSK<'a> { /// // Only write out the primary key's secret. /// let mut buf = Vec::new(); /// cert.as_tsk() - /// .set_filter( - /// |k| k == cert.primary_key() - /// .mark_parts_secret_ref().unwrap() - /// .mark_role_unspecified_ref()) + /// .set_filter(|k| k.fingerprint() == cert.fingerprint()) /// .serialize(&mut buf)?; /// /// let cert_ = Cert::from_bytes(&buf)?; /// assert_eq!(cert_.keys().policy(None).alive().revoked(false).secret().count(), 1); - /// assert!(cert_.primary_key().secret().is_some()); + /// assert!(cert_.primary().secret().is_some()); /// # Ok(()) } pub fn set_filter<P>(mut self, predicate: P) -> Self where P: 'a + Fn(&'a key::UnspecifiedSecret) -> bool @@ -736,7 +733,7 @@ mod test { }; let (cert, _) = CertBuilder::new().generate().unwrap(); - let mut keypair = cert.primary_key().clone().mark_parts_secret() + let mut keypair = cert.primary().key().clone().mark_parts_secret() .unwrap().into_keypair().unwrap(); let key: key::SecretSubkey = |