diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2020-02-06 14:15:10 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2020-02-06 14:15:10 +0100 |
| commit | d183e12a3231e4c505f5f2cf48b6c1f881ad258a (patch) | |
| tree | affb4e4c0acc3bce3d14adba627f5193c166bc32 /net | |
| parent | c8eb94375a38e5606441a9e86d402442662ffb02 (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 'net')
| -rw-r--r-- | net/src/wkd.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/src/wkd.rs b/net/src/wkd.rs index fd598731..0b16ac35 100644 --- a/net/src/wkd.rs +++ b/net/src/wkd.rs @@ -235,7 +235,7 @@ fn parse_body<S: AsRef<str>>(body: &[u8], email_address: S) let valid_certs: Vec<Cert> = certs.iter() // XXX: This filter could become a Cert method, but it adds other API // method to maintain - .filter(|cert| {cert.userids().bindings() + .filter(|cert| {cert.userids().bundles() .any(|uidb| if let Ok(Some(a)) = uidb.userid().email() { a == email_address @@ -344,7 +344,7 @@ pub fn insert<P, S, V>(base_path: P, domain: S, variant: V, let variant = variant.into().unwrap_or_default(); // First, check which UserIDs are in `domain`. - let addresses = cert.userids().bindings().filter_map(|uidb| { + let addresses = cert.userids().bundles().filter_map(|uidb| { uidb.userid().email().unwrap_or(None).and_then(|addr| { if EmailAddress::from(&addr).ok().map(|e| e.domain == domain) .unwrap_or(false) |