summaryrefslogtreecommitdiffstats
path: root/tool/src
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2020-04-27 13:41:48 +0200
committerNeal H. Walfield <neal@pep.foundation>2020-04-28 08:32:40 +0200
commit22a777c7c5db1d35642bfb9d2ab44b4833937956 (patch)
tree2f6ff41f3034ac48b642ed3280b1b2d5f02ebcf6 /tool/src
parent313c9ef9774c20d6e3dfe1f53ad3fdc7181c60dd (diff)
openpgp: Rename Cert::revoked, etc. to revocation_status
- Rename `Cert::revoked`, `ValidCert::revoked`, `ValidAmalgamation::revoked`, and `ComponentBundle::revoked` to revocation_status to more accurately match what it does. - Don't rename `ValidComponentAmalgamationIter::revoked` or `ValidKeyAmalgamationIter::revoked`. They don't return the revocation status; they check whether the key is revoked.
Diffstat (limited to 'tool/src')
-rw-r--r--tool/src/commands/inspect.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index 43e3d262..e76b680b 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -137,14 +137,14 @@ fn inspect_cert(policy: &dyn Policy,
}
writeln!(output)?;
writeln!(output, " Fingerprint: {}", cert.fingerprint())?;
- inspect_revocation(output, "", cert.revoked(policy, None))?;
+ inspect_revocation(output, "", cert.revocation_status(policy, None))?;
inspect_key(policy, output, "", cert.keys().nth(0).unwrap(),
print_keygrips, print_certifications)?;
writeln!(output)?;
for vka in cert.keys().subkeys().with_policy(policy, None) {
writeln!(output, " Subkey: {}", vka.key().fingerprint())?;
- inspect_revocation(output, "", vka.revoked())?;
+ inspect_revocation(output, "", vka.revocation_status())?;
inspect_key(policy, output, "", vka.into_key_amalgamation().into(),
print_keygrips, print_certifications)?;
writeln!(output)?;
@@ -161,7 +161,7 @@ fn inspect_cert(policy: &dyn Policy,
for uidb in cert.userids() {
writeln!(output, " UserID: {}", uidb.userid())?;
- inspect_revocation(output, "", uidb.revoked(policy, None))?;
+ inspect_revocation(output, "", uidb.revocation_status(policy, None))?;
match uidb.binding_signature(policy, None) {
Ok(sig) => if let Err(e) =
sig.signature_alive(None, std::time::Duration::new(0, 0))
@@ -178,7 +178,7 @@ fn inspect_cert(policy: &dyn Policy,
for uab in cert.user_attributes() {
writeln!(output, " UserID: {:?}", uab.user_attribute())?;
- inspect_revocation(output, "", uab.revoked(policy, None))?;
+ inspect_revocation(output, "", uab.revocation_status(policy, None))?;
match uab.binding_signature(policy, None) {
Ok(sig) => if let Err(e) =
sig.signature_alive(None, std::time::Duration::new(0, 0))