summaryrefslogtreecommitdiffstats
path: root/tool
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2020-02-06 14:15:10 +0100
committerJustus Winter <justus@sequoia-pgp.org>2020-02-06 14:15:10 +0100
commitd183e12a3231e4c505f5f2cf48b6c1f881ad258a (patch)
treeaffb4e4c0acc3bce3d14adba627f5193c166bc32 /tool
parentc8eb94375a38e5606441a9e86d402442662ffb02 (diff)
openpgp: Rename ComponentBinding to ComponentBundle, etc.
- Likewise KeyBinding, UserIDBinding, UserAttributeBinding, UnknownBinding, etc. - Reason: a self-signature on a component is a binding, but revocations and TPSes are not bindings. - Consistently call collections of components and associated signatures bundles now. Likewise for fields, methods. - Fixes #425.
Diffstat (limited to 'tool')
-rw-r--r--tool/src/commands/inspect.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index c83c8c95..fedc792e 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -150,7 +150,7 @@ fn inspect_cert(policy: &dyn Policy,
writeln!(output)?;
}
- for uidb in cert.userids().bindings() {
+ for uidb in cert.userids().bundles() {
writeln!(output, " UserID: {}", uidb.userid())?;
inspect_revocation(output, "", uidb.revoked(policy, None))?;
if let Some(sig) = uidb.binding_signature(policy, None) {
@@ -166,7 +166,7 @@ fn inspect_cert(policy: &dyn Policy,
writeln!(output)?;
}
- for uab in cert.user_attributes().bindings() {
+ for uab in cert.user_attributes().bundles() {
writeln!(output, " UserID: {:?}", uab.user_attribute())?;
inspect_revocation(output, "", uab.revoked(policy, None))?;
if let Some(sig) = uab.binding_signature(policy, None) {
@@ -213,7 +213,7 @@ fn inspect_key(policy: &dyn Policy,
-> Result<()>
{
let key = ka.key();
- let binding = ka.binding();
+ let binding = ka.bundle();
let vka = match ka.set_policy(policy, None) {
Ok(vka) => {
if let Err(e) = vka.alive() {