From 75fb008711f0f80028230018ab37b988175211b4 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Sun, 4 Aug 2019 00:27:41 +0200 Subject: openpgp: Rename SubkeyBinding to KeyBinding. - Also rename the `subkey` method to `key`. --- tool/src/commands/decrypt.rs | 2 +- tool/src/commands/inspect.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tool') diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs index 748f9c7a..2a3424dd 100644 --- a/tool/src/commands/decrypt.rs +++ b/tool/src/commands/decrypt.rs @@ -61,7 +61,7 @@ impl<'a> Helper<'a> { } for skb in tsk.subkeys() { - let key = skb.subkey(); + let key = skb.key(); if can_encrypt(key, skb.binding_signature()) { let id = key.fingerprint().to_keyid(); keys.insert(id.clone(), key.clone()); diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs index 3dbd27e0..5e3a259c 100644 --- a/tool/src/commands/inspect.rs +++ b/tool/src/commands/inspect.rs @@ -137,9 +137,9 @@ fn inspect_tpk(output: &mut io::Write, tpk: &openpgp::TPK, writeln!(output)?; for skb in tpk.subkeys() { - writeln!(output, " Subkey: {}", skb.subkey().fingerprint())?; + writeln!(output, " Subkey: {}", skb.key().fingerprint())?; inspect_revocation(output, "", skb.revoked(None))?; - inspect_key(output, "", skb.subkey(), skb.binding_signature(), + inspect_key(output, "", skb.key(), skb.binding_signature(), skb.certifications(), print_keygrips, print_certifications)?; writeln!(output)?; -- cgit v1.2.3