summaryrefslogtreecommitdiffstats
path: root/tool/src/commands
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2020-03-01 13:25:16 +0100
committerNeal H. Walfield <neal@pep.foundation>2020-03-01 13:25:16 +0100
commit91b6d82a45b7ef61b26743788f77180af74c4871 (patch)
tree7204bdec6b57856f27be39437586d4b2eb46bcaf /tool/src/commands
parentf0c948c2f8227a0ee89a40e09d4a1dea2b06b218 (diff)
openpgp: Change KeyIter::subkeys' return type.
- Change `KeyIter::subkeys` to return a `SubordinateKeyAmalgamation` instead of a `KeyBundle`. - Remove `KeyIter::skip_primary`. It does the samething as `KeyIter::subkeys`, but `KeyIter::subkeys` has a more accurate type.
Diffstat (limited to 'tool/src/commands')
-rw-r--r--tool/src/commands/inspect.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index 7684539c..56f97463 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -142,10 +142,10 @@ fn inspect_cert(policy: &dyn Policy,
print_keygrips, print_certifications)?;
writeln!(output)?;
- for vka in cert.keys().skip_primary().with_policy(policy, None) {
+ for vka in cert.keys().subkeys().with_policy(policy, None) {
writeln!(output, " Subkey: {}", vka.key().fingerprint())?;
inspect_revocation(output, "", vka.revoked())?;
- inspect_key(policy, output, "", vka.into(),
+ inspect_key(policy, output, "", vka.into_key_amalgamation().into(),
print_keygrips, print_certifications)?;
writeln!(output)?;
}