diff options
| author | Neal H. Walfield <neal@pep.foundation> | 2019-09-17 16:17:35 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2019-09-17 16:39:43 +0200 |
| commit | 1324bc3db18dbf9e27db2903515ac6c8f5b30704 (patch) | |
| tree | fec18fab616c51f9bc05966261ae75d5fb40bfa8 /tool | |
| parent | 922c47f1c4ccc05c3d1f121df02cf685f857e435 (diff) | |
openpgp: Change TPK::primary_key_signature to take a time.
- Change `TPK::primary_key_signature` and
`TPK::primary_key_signature_full` to take an additional parameter,
a time.
- Return the primary key signature at that time rather than the
newest primary key signature.
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/src/commands/decrypt.rs | 2 | ||||
| -rw-r--r-- | tool/src/commands/inspect.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs index 48b14e46..9906b583 100644 --- a/tool/src/commands/decrypt.rs +++ b/tool/src/commands/decrypt.rs @@ -58,7 +58,7 @@ impl<'a> Helper<'a> { None => format!("{}", tsk.fingerprint().to_keyid()), }; - if can_encrypt(tsk.primary().key(), tsk.primary_key_signature()) { + if can_encrypt(tsk.primary().key(), tsk.primary_key_signature(None)) { let id = tsk.fingerprint().to_keyid(); keys.insert(id.clone(), tsk.primary().key().clone().into()); identities.insert(id.clone(), tsk.fingerprint()); diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs index 95fd07fa..bec79b1d 100644 --- a/tool/src/commands/inspect.rs +++ b/tool/src/commands/inspect.rs @@ -131,7 +131,7 @@ fn inspect_tpk(output: &mut io::Write, tpk: &openpgp::TPK, writeln!(output)?; writeln!(output, " Fingerprint: {}", tpk.fingerprint())?; inspect_revocation(output, "", tpk.revocation_status())?; - inspect_key(output, "", tpk.primary().key(), tpk.primary_key_signature(), + inspect_key(output, "", tpk.primary().key(), tpk.primary_key_signature(None), tpk.primary().certifications(), print_keygrips, print_certifications)?; writeln!(output)?; |