diff options
| author | Neal H. Walfield <neal@pep.foundation> | 2019-12-20 14:22:09 +0100 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2019-12-20 14:22:09 +0100 |
| commit | f078f93025b517609d25ce2cb2ebc41a01d81190 (patch) | |
| tree | 32766c92a0a6e7877b538d373cced9c9f0a97019 /openpgp/src/parse | |
| parent | b3ba97146f534ac5cf67db7f72d8a633112d0a18 (diff) | |
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().
Diffstat (limited to 'openpgp/src/parse')
| -rw-r--r-- | openpgp/src/parse/stream.rs | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |