diff options
Diffstat (limited to 'tool/src/commands/mod.rs')
| -rw-r--r-- | tool/src/commands/mod.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs index 1263fa05..1e136572 100644 --- a/tool/src/commands/mod.rs +++ b/tool/src/commands/mod.rs @@ -48,7 +48,7 @@ fn get_signing_keys(certs: &[openpgp::Cert]) { let mut keys = Vec::new(); 'next_cert: for tsk in certs { - for key in tsk.keys_valid() + for key in tsk.keys().alive().revoked(false) .for_signing() .map(|ka| ka.key()) { @@ -112,7 +112,9 @@ pub fn encrypt(mapping: &mut store::Mapping, let mut recipient_subkeys: Vec<Recipient> = Vec::new(); for cert in certs.iter() { let mut count = 0; - for key in cert.keys_valid().key_flags(mode.clone()).map(|ka| ka.key()) { + for key in cert.keys().alive().revoked(false). + key_flags(mode.clone()).map(|ka| ka.key()) + { recipient_subkeys.push(key.into()); count += 1; } @@ -306,7 +308,7 @@ impl<'a> VerificationHelper for VHelper<'a> { .flat_map(|cert| { // Even if a key is revoked or expired, we can still // use it to verify a message. - cert.keys_all().map(|ka| ka.key().fingerprint().into()) + cert.keys().map(|ka| ka.key().fingerprint().into()) }).collect(); // Explicitly provided keys are trusted. |