From 4ac2436feb4a38fa4c5d7f446f6b2926f5f033bb Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Tue, 21 Jan 2020 17:18:05 +0100 Subject: openpgp: Rename Cert::primary to Cert::primary_key. --- openpgp/src/autocrypt.rs | 2 +- openpgp/src/cert/bindings.rs | 16 ++++++++-------- openpgp/src/cert/builder.rs | 20 +++++++++---------- openpgp/src/cert/mod.rs | 38 ++++++++++++++++++------------------- openpgp/src/cert/revoke.rs | 10 +++++----- openpgp/src/crypto/hash.rs | 6 +++--- openpgp/src/packet/key/mod.rs | 6 +++--- openpgp/src/packet/signature/mod.rs | 10 +++++----- openpgp/src/serialize/cert.rs | 12 ++++++------ openpgp/src/serialize/mod.rs | 2 +- 10 files changed, 61 insertions(+), 61 deletions(-) (limited to 'openpgp') diff --git a/openpgp/src/autocrypt.rs b/openpgp/src/autocrypt.rs index 20c91524..325ede4e 100644 --- a/openpgp/src/autocrypt.rs +++ b/openpgp/src/autocrypt.rs @@ -106,7 +106,7 @@ impl AutocryptHeader { let mut acc = Vec::new(); // The primary key and the most recent selfsig. - let primary = cert.primary().binding(); + let primary = cert.primary_key().binding(); acc.push(primary.key().clone().mark_role_primary().into()); primary.self_signatures().iter().take(1) .for_each(|s| acc.push(s.clone().into())); diff --git a/openpgp/src/cert/bindings.rs b/openpgp/src/cert/bindings.rs index fa372680..688e850b 100644 --- a/openpgp/src/cert/bindings.rs +++ b/openpgp/src/cert/bindings.rs @@ -31,7 +31,7 @@ impl Key { /// # fn f() -> Result<()> { /// // Generate a Cert, and create a keypair from the primary key. /// let (cert, _) = CertBuilder::new().generate()?; - /// let mut keypair = cert.primary().key().clone() + /// let mut keypair = cert.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// /// // Let's add an encryption subkey. @@ -65,7 +65,7 @@ impl Key { .set_issuer_fingerprint(signer.public().fingerprint())? .set_issuer(signer.public().keyid())? .sign_subkey_binding( - signer, cert.primary().key().mark_role_primary_ref(), self) + signer, cert.primary_key().key().mark_role_primary_ref(), self) } } @@ -93,7 +93,7 @@ impl UserID { /// # fn f() -> Result<()> { /// // Generate a Cert, and create a keypair from the primary key. /// let (cert, _) = CertBuilder::new().generate()?; - /// let mut keypair = cert.primary().key().clone() + /// let mut keypair = cert.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// assert_eq!(cert.userids().len(), 0); /// @@ -117,7 +117,7 @@ impl UserID { .set_issuer_fingerprint(signer.public().fingerprint())? .set_issuer(signer.public().keyid())? .sign_userid_binding( - signer, cert.primary().key().mark_role_primary_ref(), self) + signer, cert.primary_key().key().mark_role_primary_ref(), self) } /// Returns a certificate for the user id. @@ -151,7 +151,7 @@ impl UserID { /// .primary_key_flags(KeyFlags::default().set_certification(true)) /// .add_userid("alice@example.org") /// .generate()?; - /// let mut keypair = alice.primary().key().clone() + /// let mut keypair = alice.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// /// // Generate a Cert for Bob. @@ -228,7 +228,7 @@ impl UserAttribute { /// // Generate a Cert, and create a keypair from the primary key. /// let (cert, _) = CertBuilder::new() /// .generate()?; - /// let mut keypair = cert.primary().key().clone() + /// let mut keypair = cert.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// assert_eq!(cert.userids().len(), 0); /// @@ -255,7 +255,7 @@ impl UserAttribute { .set_issuer_fingerprint(signer.public().fingerprint())? .set_issuer(signer.public().keyid())? .sign_user_attribute_binding( - signer, cert.primary().key().mark_role_primary_ref(), self) + signer, cert.primary_key().key().mark_role_primary_ref(), self) } /// Returns a certificate for the user attribute. @@ -289,7 +289,7 @@ impl UserAttribute { /// let (alice, _) = CertBuilder::new() /// .add_userid("alice@example.org") /// .generate()?; - /// let mut keypair = alice.primary().key().clone() + /// let mut keypair = alice.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// /// // Generate a Cert for Bob. diff --git a/openpgp/src/cert/builder.rs b/openpgp/src/cert/builder.rs index 40f8e856..d51988dc 100644 --- a/openpgp/src/cert/builder.rs +++ b/openpgp/src/cert/builder.rs @@ -501,7 +501,7 @@ mod tests { assert_eq!(cert.userids().count(), 0); assert_eq!(cert.subkeys().count(), 3); let sig = - cert.primary().policy(None).unwrap().binding_signature(); + cert.primary_key().policy(None).unwrap().binding_signature(); assert_eq!(sig.typ(), crate::types::SignatureType::DirectKey); assert!(sig.features().unwrap().supports_mdc()); } @@ -513,14 +513,14 @@ mod tests { .set_cipher_suite(CipherSuite::RSA3k) .set_cipher_suite(CipherSuite::Cv25519) .generate().unwrap(); - assert_eq!(cert1.primary().pk_algo(), PublicKeyAlgorithm::EdDSA); + assert_eq!(cert1.primary_key().pk_algo(), PublicKeyAlgorithm::EdDSA); let (cert2, _) = CertBuilder::new() .set_cipher_suite(CipherSuite::RSA3k) .add_userid("test2@example.com") .add_transport_encryption_subkey() .generate().unwrap(); - assert_eq!(cert2.primary().pk_algo(), + assert_eq!(cert2.primary_key().pk_algo(), PublicKeyAlgorithm::RSAEncryptSign); assert_eq!(cert2.subkeys().next().unwrap().key().pk_algo(), PublicKeyAlgorithm::RSAEncryptSign); @@ -531,7 +531,7 @@ mod tests { let (cert1, _) = CertBuilder::new() .add_userid("test2@example.com") .generate().unwrap(); - assert_eq!(cert1.primary().pk_algo(), + assert_eq!(cert1.primary_key().pk_algo(), PublicKeyAlgorithm::EdDSA); assert!(cert1.subkeys().next().is_none()); if let Some(sig) = cert1.primary_key_signature(None) { @@ -546,7 +546,7 @@ mod tests { let (cert1, _) = CertBuilder::autocrypt(Autocrypt::V1, Some("Foo")) .generate().unwrap(); - assert_eq!(cert1.primary().pk_algo(), + assert_eq!(cert1.primary_key().pk_algo(), PublicKeyAlgorithm::RSAEncryptSign); assert_eq!(cert1.subkeys().next().unwrap().key().pk_algo(), PublicKeyAlgorithm::RSAEncryptSign); @@ -558,7 +558,7 @@ mod tests { let (cert1, _) = CertBuilder::autocrypt(Autocrypt::V1_1, Some("Foo")) .generate().unwrap(); - assert_eq!(cert1.primary().pk_algo(), + assert_eq!(cert1.primary_key().pk_algo(), PublicKeyAlgorithm::EdDSA); assert_eq!(cert1.subkeys().next().unwrap().key().pk_algo(), PublicKeyAlgorithm::ECDH); @@ -638,7 +638,7 @@ mod tests { .set_cipher_suite(CipherSuite::Cv25519) .set_password(Some(String::from("streng geheim").into())) .generate().unwrap(); - assert!(cert.primary().secret().unwrap().is_encrypted()); + assert!(cert.primary_key().secret().unwrap().is_encrypted()); } #[test] @@ -663,9 +663,9 @@ mod tests { None) .generate().unwrap(); - let now = cert.primary().creation_time() + let now = cert.primary_key().creation_time() + 5 * s; // The subkeys may be created a tad later. - let key = cert.primary().key(); + let key = cert.primary_key().key(); let sig = cert.primary_key_signature(None).unwrap(); assert!(sig.key_alive(key, now).is_ok()); assert!(sig.key_alive(key, now + 590 * s).is_ok()); @@ -696,7 +696,7 @@ mod tests { .add_signing_subkey() .generate().unwrap(); - assert_eq!(cert.primary().creation_time(), UNIX_EPOCH); + assert_eq!(cert.primary_key().creation_time(), UNIX_EPOCH); assert_eq!(cert.primary_key_signature(None).unwrap() .signature_creation_time().unwrap(), UNIX_EPOCH); assert_eq!(rev.signature_creation_time().unwrap(), UNIX_EPOCH); diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs index addd2c48..dd306031a 100644 --- a/openpgp/src/cert/mod.rs +++ b/openpgp/src/cert/mod.rs @@ -282,7 +282,7 @@ type UnknownBindings = ComponentBindings; /// let mut acc = Vec::new(); /// /// // Primary key and related signatures. -/// let c = cert.primary().binding(); +/// let c = cert.primary_key().binding(); /// acc.push(c.key().clone().mark_role_primary().into()); /// for s in c.self_signatures() { acc.push(s.clone().into()) } /// for s in c.certifications() { acc.push(s.clone().into()) } @@ -410,7 +410,7 @@ impl<'a> Parse<'a, Cert> for Cert { impl Cert { /// Returns the amalgamated primary key. - pub fn primary(&self) -> KeyAmalgamation + pub fn primary_key(&self) -> KeyAmalgamation { self.keys().nth(0).expect("primary key").into() } @@ -530,7 +530,7 @@ impl Cert { /// assert_eq!(RevocationStatus::NotAsFarAsWeKnow, /// cert.revoked(None)); /// - /// let mut keypair = cert.primary().key().clone() + /// let mut keypair = cert.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// let cert = cert.revoke_in_place(&mut keypair, /// ReasonForRevocation::KeyCompromised, @@ -563,7 +563,7 @@ impl Cert { { let t = t.into(); if let Some(sig) = self.primary_key_signature(t) { - sig.key_alive(self.primary().key(), t) + sig.key_alive(self.primary_key().key(), t) } else { Err(Error::MalformedCert("No primary key signature".into()).into()) } @@ -590,7 +590,7 @@ impl Cert { let hash_algo = HashAlgorithm::SHA512; let mut hash = hash_algo.context()?; - self.primary().hash(&mut hash); + self.primary_key().hash(&mut hash); if let Some((userid, _)) = userid { userid.userid().hash(&mut hash); } else { @@ -1297,7 +1297,7 @@ impl Cert { /// Returns whether at least one of the keys includes a secret /// part. pub fn is_tsk(&self) -> bool { - if self.primary().secret().is_some() { + if self.primary_key().secret().is_some() { return true; } self.subkeys().any(|sk| { @@ -1787,14 +1787,14 @@ mod test { let cert = Cert::from_bytes(crate::tests::key("about-to-expire.expired.pgp")) .unwrap(); assert!(! cert.primary_key_signature(None).unwrap() - .key_alive(cert.primary().key(), None).is_ok()); + .key_alive(cert.primary_key().key(), None).is_ok()); let update = Cert::from_bytes(crate::tests::key("about-to-expire.update-no-uid.pgp")) .unwrap(); let cert = cert.merge(update).unwrap(); assert!(cert.primary_key_signature(None).unwrap() - .key_alive(cert.primary().key(), None).is_ok()); + .key_alive(cert.primary_key().key(), None).is_ok()); } #[test] @@ -1854,14 +1854,14 @@ mod test { let (cert, _) = CertBuilder::autocrypt(None, Some("Test")) .generate().unwrap(); - let now = cert.primary().creation_time(); + let now = cert.primary_key().creation_time(); let a_sec = time::Duration::new(1, 0); let expiry_orig = cert.primary_key_signature(None).unwrap() .key_expiration_time() .expect("Keys expire by default."); - let mut keypair = cert.primary().key().clone().mark_parts_secret() + let mut keypair = cert.primary_key().key().clone().mark_parts_secret() .unwrap().into_keypair().unwrap(); // Clear the expiration. @@ -2034,7 +2034,7 @@ mod test { assert_eq!(RevocationStatus::NotAsFarAsWeKnow, cert.revoked(None)); - let mut keypair = cert.primary().key().clone().mark_parts_secret() + let mut keypair = cert.primary_key().key().clone().mark_parts_secret() .unwrap().into_keypair().unwrap(); let sig = CertRevocationBuilder::new() @@ -2056,7 +2056,7 @@ mod test { let (other, _) = CertBuilder::autocrypt(None, Some("Test 2")) .generate().unwrap(); - let mut keypair = other.primary().key().clone().mark_parts_secret() + let mut keypair = other.primary_key().key().clone().mark_parts_secret() .unwrap().into_keypair().unwrap(); let sig = CertRevocationBuilder::new() @@ -2082,7 +2082,7 @@ mod test { let subkey = cert.subkeys().nth(0).unwrap(); assert_eq!(RevocationStatus::NotAsFarAsWeKnow, subkey.revoked(None)); - let mut keypair = cert.primary().key().clone().mark_parts_secret() + let mut keypair = cert.primary_key().key().clone().mark_parts_secret() .unwrap().into_keypair().unwrap(); SubkeyRevocationBuilder::new() .set_reason_for_revocation( @@ -2111,7 +2111,7 @@ mod test { let uid = cert.userids().policy(None).nth(1).unwrap(); assert_eq!(RevocationStatus::NotAsFarAsWeKnow, uid.revoked()); - let mut keypair = cert.primary().key().clone().mark_parts_secret() + let mut keypair = cert.primary_key().key().clone().mark_parts_secret() .unwrap().into_keypair().unwrap(); UserIDRevocationBuilder::new() .set_reason_for_revocation( @@ -2803,7 +2803,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= cert = cert.merge_packets(vec![ binding ]).unwrap(); // A time that matches multiple signatures. let direct_signatures = - cert.primary().binding().self_signatures(); + cert.primary_key().binding().self_signatures(); assert_eq!(cert.primary_key_signature(*t), direct_signatures.get(*offset)); // A time that doesn't match any signature. @@ -2856,7 +2856,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= // Have alice cerify the binding "bob@bar.com" and bob's key. let alice_certifies_bob = bob_userid_binding.userid().bind( - &mut alice.primary().key().clone().mark_parts_secret() + &mut alice.primary_key().key().clone().mark_parts_secret() .unwrap().into_keypair().unwrap(), &bob, sig_template).unwrap(); @@ -2882,8 +2882,8 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= // Make sure the certification is correct. alice_certifies_bob - .verify_userid_binding(alice.primary().key().mark_role_primary_ref(), - bob.primary().key().mark_role_primary_ref(), + .verify_userid_binding(alice.primary_key().key().mark_role_primary_ref(), + bob.primary_key().key().mark_role_primary_ref(), bob_userid_binding.userid()).unwrap(); } } @@ -2897,7 +2897,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= assert_eq!(cert.keys().secret().count(), 2); assert_eq!(cert.keys().unencrypted_secret().count(), 0); - let mut primary = cert.primary().key().clone(); + let mut primary = cert.primary_key().key().clone(); let algo = primary.pk_algo(); primary.secret_mut().unwrap() .decrypt_in_place(algo, &"streng geheim".into()).unwrap(); diff --git a/openpgp/src/cert/revoke.rs b/openpgp/src/cert/revoke.rs index fea84064..48633d41 100644 --- a/openpgp/src/cert/revoke.rs +++ b/openpgp/src/cert/revoke.rs @@ -54,7 +54,7 @@ use crate::cert::Cert; /// assert_eq!(RevocationStatus::NotAsFarAsWeKnow, /// cert.revoked(None)); /// -/// let mut signer = cert.primary().key().clone() +/// let mut signer = cert.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// let sig = CertRevocationBuilder::new() /// .set_reason_for_revocation(ReasonForRevocation::KeyCompromised, @@ -108,7 +108,7 @@ impl CertRevocationBuilder { let hash_algo = hash_algo.into().unwrap_or(HashAlgorithm::SHA512); let mut hash = hash_algo.context()?; - cert.primary().hash(&mut hash); + cert.primary_key().hash(&mut hash); let creation_time = self.signature_creation_time() @@ -161,7 +161,7 @@ impl Deref for CertRevocationBuilder { /// let (cert, _) = CertBuilder::new() /// .add_transport_encryption_subkey() /// .generate()?; -/// let mut keypair = cert.primary().key().clone() +/// let mut keypair = cert.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// let subkey = cert.keys().subkeys().nth(0).unwrap(); /// @@ -274,7 +274,7 @@ impl Deref for SubkeyRevocationBuilder { /// let (cert, _) = CertBuilder::new() /// .add_userid("some@example.org") /// .generate()?; -/// let mut keypair = cert.primary().key().clone() +/// let mut keypair = cert.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// let userid = cert.userids().nth(0).unwrap(); /// @@ -389,7 +389,7 @@ impl Deref for UserIDRevocationBuilder { /// let (cert, _) = CertBuilder::new() /// .add_user_attribute(some_user_attribute) /// .generate()?; -/// let mut keypair = cert.primary().key().clone() +/// let mut keypair = cert.primary_key().key().clone() /// .mark_parts_secret()?.into_keypair()?; /// let ua = cert.user_attributes().nth(0).unwrap(); /// diff --git a/openpgp/src/crypto/hash.rs b/openpgp/src/crypto/hash.rs index 31c5099a..0afd1d33 100644 --- a/openpgp/src/crypto/hash.rs +++ b/openpgp/src/crypto/hash.rs @@ -495,7 +495,7 @@ mod test { for selfsig in binding.self_signatures() { let h = Signature::hash_userid_binding( selfsig, - cert.primary().key().mark_role_primary_ref(), + cert.primary_key().key().mark_role_primary_ref(), binding.userid()).unwrap(); if &h[..2] != selfsig.digest_prefix() { eprintln!("{:?}: {:?} / {:?}", @@ -512,7 +512,7 @@ mod test { for selfsig in binding.self_signatures() { let h = Signature::hash_user_attribute_binding( selfsig, - cert.primary().key().mark_role_primary_ref(), + cert.primary_key().key().mark_role_primary_ref(), binding.user_attribute()).unwrap(); if &h[..2] != selfsig.digest_prefix() { eprintln!("{:?}: {:?} / {:?}", @@ -528,7 +528,7 @@ mod test { for selfsig in binding.self_signatures() { let h = Signature::hash_subkey_binding( selfsig, - cert.primary().key().mark_role_primary_ref(), + cert.primary_key().key().mark_role_primary_ref(), binding.key()).unwrap(); if &h[..2] != selfsig.digest_prefix() { eprintln!("{:?}: {:?}", i, binding); diff --git a/openpgp/src/packet/key/mod.rs b/openpgp/src/packet/key/mod.rs index 40f6905a..9f37507c 100644 --- a/openpgp/src/packet/key/mod.rs +++ b/openpgp/src/packet/key/mod.rs @@ -43,10 +43,10 @@ //! // Get a handle to the Cert's primary key that allows using the //! // secret key material. //! use std::convert::TryInto; -//! let sk: &Key = cert.primary().key().try_into()?; +//! let sk: &Key = cert.primary_key().key().try_into()?; //! //! // Make the conversion explicit. -//! let sk = cert.primary().key().mark_parts_secret_ref()?.mark_role_primary_ref(); +//! let sk = cert.primary_key().key().mark_parts_secret_ref()?.mark_role_primary_ref(); //! # Ok(()) //! # } //! ``` @@ -1328,7 +1328,7 @@ mod tests { fn encrypted_rsa_key() { let cert = Cert::from_bytes( crate::tests::key("testy-new-encrypted-with-123.pgp")).unwrap(); - let mut pair = cert.primary().key().clone(); + let mut pair = cert.primary_key().key().clone(); let pk_algo = pair.pk_algo(); let secret = pair.secret.as_mut().unwrap(); diff --git a/openpgp/src/packet/signature/mod.rs b/openpgp/src/packet/signature/mod.rs index a44a8929..3ed80f38 100644 --- a/openpgp/src/packet/signature/mod.rs +++ b/openpgp/src/packet/signature/mod.rs @@ -1212,7 +1212,7 @@ mod test { crate::tests::message(test.data)).unwrap(); while let PacketParserResult::Some(pp) = ppr { if let Packet::Signature(ref sig) = pp.packet { - let result = sig.verify(cert.primary().key()) + let result = sig.verify(cert.primary_key().key()) .map(|_| true).unwrap_or(false); eprintln!(" Primary {:?}: {:?}", cert.fingerprint(), result); @@ -1274,7 +1274,7 @@ mod test { "emmelie-dorothea-dina-samantha-awina-ed25519-private.pgp", ] { let cert = Cert::from_bytes(crate::tests::key(key)).unwrap(); - let mut pair = cert.primary().key().clone() + let mut pair = cert.primary_key().key().clone() .mark_parts_secret().unwrap() .into_keypair() .expect("secret key is encrypted/missing"); @@ -1331,7 +1331,7 @@ mod test { panic!("Expected a Signature, got: {:?}", p); }; - sig.verify_message(cert.primary().key(), &msg[..]).unwrap(); + sig.verify_message(cert.primary_key().key(), &msg[..]).unwrap(); } #[test] @@ -1389,7 +1389,7 @@ mod test { let cert = &uid_binding.certifications()[0]; cert.verify_userid_binding(cert_key1, - test2.primary().key().mark_role_primary_ref(), + test2.primary_key().key().mark_role_primary_ref(), uid_binding.userid()).unwrap(); } @@ -1473,7 +1473,7 @@ mod test { if let Packet::Signature(sig) = p { let digest = Signature::hash_standalone(&sig).unwrap(); eprintln!("{}", crate::fmt::hex::encode(&digest)); - sig.verify_timestamp(alpha.primary().key()).unwrap(); + sig.verify_timestamp(alpha.primary_key().key()).unwrap(); } else { panic!("expected a signature packet"); } diff --git a/openpgp/src/serialize/cert.rs b/openpgp/src/serialize/cert.rs index c3ec4f6d..c9cc6d38 100644 --- a/openpgp/src/serialize/cert.rs +++ b/openpgp/src/serialize/cert.rs @@ -25,7 +25,7 @@ impl Cert { fn serialize_common(&self, o: &mut dyn std::io::Write, export: bool) -> Result<()> { - let primary = self.primary().binding(); + let primary = self.primary_key().binding(); PacketRef::PublicKey(primary.key().mark_role_primary_ref()) .serialize(o)?; @@ -160,7 +160,7 @@ impl Cert { impl SerializeInto for Cert { fn serialized_len(&self) -> usize { let mut l = 0; - let primary = self.primary().binding(); + let primary = self.primary_key().binding(); l += PacketRef::PublicKey(primary.key().mark_role_primary_ref()) .serialized_len(); @@ -330,7 +330,7 @@ impl<'a> TSK<'a> { /// /// let cert_ = Cert::from_bytes(&buf)?; /// assert_eq!(cert_.keys().policy(None).alive().revoked(false).secret().count(), 1); - /// assert!(cert_.primary().secret().is_some()); + /// assert!(cert_.primary_key().secret().is_some()); /// # Ok(()) } pub fn set_filter

(mut self, predicate: P) -> Self where P: 'a + Fn(&'a key::UnspecifiedSecret) -> bool @@ -386,7 +386,7 @@ impl<'a> TSK<'a> { } }; - let primary = self.cert.primary().binding(); + let primary = self.cert.primary_key().binding(); serialize_key(o, primary.key().mark_role_primary_ref().into(), Tag::PublicKey, Tag::SecretKey)?; @@ -541,7 +541,7 @@ impl<'a> SerializeInto for TSK<'a> { packet.serialized_len() }; - let primary = self.cert.primary().binding(); + let primary = self.cert.primary_key().binding(); l += serialized_len_key(primary.key().mark_role_primary_ref().into(), Tag::PublicKey, Tag::SecretKey); @@ -733,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().key().clone().mark_parts_secret() .unwrap().into_keypair().unwrap(); let key: key::SecretSubkey = diff --git a/openpgp/src/serialize/mod.rs b/openpgp/src/serialize/mod.rs index 7319cc0d..2ebb9574 100644 --- a/openpgp/src/serialize/mod.rs +++ b/openpgp/src/serialize/mod.rs @@ -2958,7 +2958,7 @@ mod test { use crate::cert::CertBuilder; let (cert, _) = CertBuilder::new().generate().unwrap(); - let mut keypair = cert.primary().key().clone().mark_parts_secret() + let mut keypair = cert.primary_key().key().clone().mark_parts_secret() .unwrap().into_keypair().unwrap(); let uid = UserID::from("foo"); -- cgit v1.2.3