From f078f93025b517609d25ce2cb2ebc41a01d81190 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Fri, 20 Dec 2019 14:22:09 +0100 Subject: openpgp: Simplify key iteration interface. - Cert::keys_valid() is just a short-cut for Cert::keys_all().alive().revoked(false). - Remove Cert::keys_valid() and rename Cert::keys_all() to Cert::keys(). --- openpgp/src/parse/stream.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openpgp/src/parse') diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs index fe0d7dd5..ee7cd39b 100644 --- a/openpgp/src/parse/stream.rs +++ b/openpgp/src/parse/stream.rs @@ -699,7 +699,7 @@ impl<'a, H: VerificationHelper> Verifier<'a, H> { if let Some((i, j)) = self.keys.get(&issuer) { let cert = &self.certs[*i]; - let ka = cert.keys_all().nth(*j).unwrap(); + let ka = cert.keys().nth(*j).unwrap(); let binding = ka.binding_signature(self.time); let revoked = ka.revoked(self.time); let key = ka.key(); @@ -1596,7 +1596,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> { if let Some((i, j)) = self.keys.get(&issuer) { let cert = &self.certs[*i]; - let ka = cert.keys_all().nth(*j).unwrap(); + let ka = cert.keys().nth(*j).unwrap(); let binding = ka.binding_signature(self.time); let revoked = ka.revoked(self.time); let key = ka.key(); @@ -2063,7 +2063,7 @@ mod test { // sign 30MiB message let mut buf = vec![]; { - let key = cert.keys_all().for_signing().nth(0).unwrap().key(); + let key = cert.keys().for_signing().nth(0).unwrap().key(); let keypair = key.clone().mark_parts_secret().unwrap() .into_keypair().unwrap(); -- cgit v1.2.3