diff options
| -rw-r--r-- | examples/guide-exploring-openpgp.rs | 4 | ||||
| -rw-r--r-- | openpgp/src/autocrypt.rs | 4 | ||||
| -rw-r--r-- | openpgp/src/crypto/hash.rs | 6 | ||||
| -rw-r--r-- | openpgp/src/serialize/tpk.rs | 44 | ||||
| -rw-r--r-- | openpgp/src/tpk/builder.rs | 2 | ||||
| -rw-r--r-- | openpgp/src/tpk/mod.rs | 74 | ||||
| -rw-r--r-- | openpgp/src/tpk/parser/low_level/grammar.lalrpop | 10 | ||||
| -rw-r--r-- | openpgp/src/tpk/parser/mod.rs | 6 |
8 files changed, 75 insertions, 75 deletions
diff --git a/examples/guide-exploring-openpgp.rs b/examples/guide-exploring-openpgp.rs index bb7f4572..cff65378 100644 --- a/examples/guide-exploring-openpgp.rs +++ b/examples/guide-exploring-openpgp.rs @@ -55,7 +55,7 @@ fn main() { for (i, u) in tpk.userids().enumerate() { println!("{}: UID: {}, {} self-signature(s), {} certification(s)", i, u.userid(), - u.selfsigs().len(), + u.self_signatures().len(), u.certifications().len()); } @@ -63,7 +63,7 @@ fn main() { for (i, s) in tpk.subkeys().enumerate() { println!("{}: Fingerprint: {}, {} self-signature(s), {} certification(s)", i, s.key().fingerprint(), - s.selfsigs().len(), + s.self_signatures().len(), s.certifications().len()); } } diff --git a/openpgp/src/autocrypt.rs b/openpgp/src/autocrypt.rs index 6c1186ec..d849244c 100644 --- a/openpgp/src/autocrypt.rs +++ b/openpgp/src/autocrypt.rs @@ -121,7 +121,7 @@ impl AutocryptHeader { let k : key::PublicSubkey = skb.key().clone(); acc.push(k.into()); - skb.selfsigs().iter().take(1) + skb.self_signatures().iter().take(1) .for_each(|s| acc.push(s.clone().into())); } @@ -131,7 +131,7 @@ impl AutocryptHeader { if let Ok(Some(a)) = uidb.userid().address() { if &a == addr { acc.push(uidb.userid().clone().into()); - uidb.selfsigs().iter().take(1) + uidb.self_signatures().iter().take(1) .for_each(|s| acc.push(s.clone().into())); } else { // Address is not matching. diff --git a/openpgp/src/crypto/hash.rs b/openpgp/src/crypto/hash.rs index b7c19c9b..ba2e0545 100644 --- a/openpgp/src/crypto/hash.rs +++ b/openpgp/src/crypto/hash.rs @@ -460,7 +460,7 @@ mod test { fn check(tpk: TPK) -> (usize, usize, usize) { let mut userid_sigs = 0; for (i, binding) in tpk.userids().enumerate() { - for selfsig in binding.selfsigs() { + for selfsig in binding.self_signatures() { let h = Signature::userid_binding_hash( selfsig, tpk.primary(), @@ -476,7 +476,7 @@ mod test { } let mut ua_sigs = 0; for (i, binding) in tpk.user_attributes().enumerate() { - for selfsig in binding.selfsigs() { + for selfsig in binding.self_signatures() { let h = Signature::user_attribute_binding_hash( selfsig, tpk.primary(), @@ -492,7 +492,7 @@ mod test { } let mut subkey_sigs = 0; for (i, binding) in tpk.subkeys().enumerate() { - for selfsig in binding.selfsigs() { + for selfsig in binding.self_signatures() { let h = Signature::subkey_binding_hash( selfsig, tpk.primary(), diff --git a/openpgp/src/serialize/tpk.rs b/openpgp/src/serialize/tpk.rs index 82b87c23..dd306031f 100644 --- a/openpgp/src/serialize/tpk.rs +++ b/openpgp/src/serialize/tpk.rs @@ -55,7 +55,7 @@ impl TPK { } for u in self.userids() { - if export && ! u.selfsigs().iter().chain(u.self_revocations()).any( + if export && ! u.self_signatures().iter().chain(u.self_revocations()).any( |s| s.exportable_certification().unwrap_or(true)) { // No exportable selfsig on this component, skip it. @@ -66,7 +66,7 @@ impl TPK { for s in u.self_revocations() { serialize_sig(o, s)?; } - for s in u.selfsigs() { + for s in u.self_signatures() { serialize_sig(o, s)?; } for s in u.other_revocations() { @@ -78,7 +78,7 @@ impl TPK { } for u in self.user_attributes() { - if export && ! u.selfsigs().iter().chain(u.self_revocations()).any( + if export && ! u.self_signatures().iter().chain(u.self_revocations()).any( |s| s.exportable_certification().unwrap_or(true)) { // No exportable selfsig on this component, skip it. @@ -89,7 +89,7 @@ impl TPK { for s in u.self_revocations() { serialize_sig(o, s)?; } - for s in u.selfsigs() { + for s in u.self_signatures() { serialize_sig(o, s)?; } for s in u.other_revocations() { @@ -101,7 +101,7 @@ impl TPK { } for k in self.subkeys() { - if export && ! k.selfsigs().iter().chain(k.self_revocations()).any( + if export && ! k.self_signatures().iter().chain(k.self_revocations()).any( |s| s.exportable_certification().unwrap_or(true)) { // No exportable selfsig on this component, skip it. @@ -112,7 +112,7 @@ impl TPK { for s in k.self_revocations() { serialize_sig(o, s)?; } - for s in k.selfsigs() { + for s in k.self_signatures() { serialize_sig(o, s)?; } for s in k.other_revocations() { @@ -136,7 +136,7 @@ impl TPK { for s in u.self_revocations() { serialize_sig(o, s)?; } - for s in u.selfsigs() { + for s in u.self_signatures() { serialize_sig(o, s)?; } for s in u.other_revocations() { @@ -179,7 +179,7 @@ impl SerializeInto for TPK { for s in u.self_revocations() { l += PacketRef::Signature(s).serialized_len(); } - for s in u.selfsigs() { + for s in u.self_signatures() { l += PacketRef::Signature(s).serialized_len(); } for s in u.other_revocations() { @@ -196,7 +196,7 @@ impl SerializeInto for TPK { for s in u.self_revocations() { l += PacketRef::Signature(s).serialized_len(); } - for s in u.selfsigs() { + for s in u.self_signatures() { l += PacketRef::Signature(s).serialized_len(); } for s in u.other_revocations() { @@ -213,7 +213,7 @@ impl SerializeInto for TPK { for s in k.self_revocations() { l += PacketRef::Signature(s).serialized_len(); } - for s in k.selfsigs() { + for s in k.self_signatures() { l += PacketRef::Signature(s).serialized_len(); } for s in k.other_revocations() { @@ -230,7 +230,7 @@ impl SerializeInto for TPK { for s in u.self_revocations() { l += PacketRef::Signature(s).serialized_len(); } - for s in u.selfsigs() { + for s in u.self_signatures() { l += PacketRef::Signature(s).serialized_len(); } for s in u.other_revocations() { @@ -400,7 +400,7 @@ impl<'a> TSK<'a> { } for u in self.tpk.userids() { - if export && ! u.selfsigs().iter().chain(u.self_revocations()).any( + if export && ! u.self_signatures().iter().chain(u.self_revocations()).any( |s| s.exportable_certification().unwrap_or(true)) { // No exportable selfsig on this component, skip it. @@ -411,7 +411,7 @@ impl<'a> TSK<'a> { for s in u.self_revocations() { serialize_sig(o, s)?; } - for s in u.selfsigs() { + for s in u.self_signatures() { serialize_sig(o, s)?; } for s in u.other_revocations() { @@ -423,7 +423,7 @@ impl<'a> TSK<'a> { } for u in self.tpk.user_attributes() { - if export && ! u.selfsigs().iter().chain(u.self_revocations()).any( + if export && ! u.self_signatures().iter().chain(u.self_revocations()).any( |s| s.exportable_certification().unwrap_or(true)) { // No exportable selfsig on this component, skip it. @@ -434,7 +434,7 @@ impl<'a> TSK<'a> { for s in u.self_revocations() { serialize_sig(o, s)?; } - for s in u.selfsigs() { + for s in u.self_signatures() { serialize_sig(o, s)?; } for s in u.other_revocations() { @@ -446,7 +446,7 @@ impl<'a> TSK<'a> { } for k in self.tpk.subkeys() { - if export && ! k.selfsigs().iter().chain(k.self_revocations()).any( + if export && ! k.self_signatures().iter().chain(k.self_revocations()).any( |s| s.exportable_certification().unwrap_or(true)) { // No exportable selfsig on this component, skip it. @@ -458,7 +458,7 @@ impl<'a> TSK<'a> { for s in k.self_revocations() { serialize_sig(o, s)?; } - for s in k.selfsigs() { + for s in k.self_signatures() { serialize_sig(o, s)?; } for s in k.other_revocations() { @@ -482,7 +482,7 @@ impl<'a> TSK<'a> { for s in u.self_revocations() { serialize_sig(o, s)?; } - for s in u.selfsigs() { + for s in u.self_signatures() { serialize_sig(o, s)?; } for s in u.other_revocations() { @@ -558,7 +558,7 @@ impl<'a> SerializeInto for TSK<'a> { for s in u.self_revocations() { l += PacketRef::Signature(s).serialized_len(); } - for s in u.selfsigs() { + for s in u.self_signatures() { l += PacketRef::Signature(s).serialized_len(); } for s in u.other_revocations() { @@ -575,7 +575,7 @@ impl<'a> SerializeInto for TSK<'a> { for s in u.self_revocations() { l += PacketRef::Signature(s).serialized_len(); } - for s in u.selfsigs() { + for s in u.self_signatures() { l += PacketRef::Signature(s).serialized_len(); } for s in u.other_revocations() { @@ -593,7 +593,7 @@ impl<'a> SerializeInto for TSK<'a> { for s in k.self_revocations() { l += PacketRef::Signature(s).serialized_len(); } - for s in k.selfsigs() { + for s in k.self_signatures() { l += PacketRef::Signature(s).serialized_len(); } for s in k.other_revocations() { @@ -610,7 +610,7 @@ impl<'a> SerializeInto for TSK<'a> { for s in u.self_revocations() { l += PacketRef::Signature(s).serialized_len(); } - for s in u.selfsigs() { + for s in u.self_signatures() { l += PacketRef::Signature(s).serialized_len(); } for s in u.other_revocations() { diff --git a/openpgp/src/tpk/builder.rs b/openpgp/src/tpk/builder.rs index fff5663b..ceca009e 100644 --- a/openpgp/src/tpk/builder.rs +++ b/openpgp/src/tpk/builder.rs @@ -543,7 +543,7 @@ mod tests { .primary_keyflags(KeyFlags::default()) .add_subkey(KeyFlags::default().set_certify(true)) .generate().unwrap(); - let sig_pkts = tpk1.subkeys().next().unwrap().selfsigs[0].hashed_area(); + let sig_pkts = tpk1.subkeys().next().unwrap().self_signatures[0].hashed_area(); match sig_pkts.lookup(SubpacketTag::KeyFlags) { Some(Subpacket{ value: SubpacketValue::KeyFlags(ref ks),.. }) => { diff --git a/openpgp/src/tpk/mod.rs b/openpgp/src/tpk/mod.rs index 37fbc51f..714112d9 100644 --- a/openpgp/src/tpk/mod.rs +++ b/openpgp/src/tpk/mod.rs @@ -114,7 +114,7 @@ pub struct ComponentBinding<C> { component: C, // Self signatures. - selfsigs: Vec<Signature>, + self_signatures: Vec<Signature>, // Third-party certifications. (In general, this will only be by // designated revokers.) @@ -152,7 +152,7 @@ impl<C> ComponentBinding<C> { let t = t.into().unwrap_or_else(time::now_utc); let time_zero = time::at_utc(time::Timespec::new(0, 0)); - self.selfsigs.iter().filter(|s| { + self.self_signatures.iter().filter(|s| { s.signature_alive(t) }).max_by(|a, b| { a.signature_creation_time().unwrap_or(time_zero).cmp( @@ -164,8 +164,8 @@ impl<C> ComponentBinding<C> { /// /// All self-signatures have been validated, and the newest /// self-signature is last. - pub fn selfsigs(&self) -> &[Signature] { - &self.selfsigs + pub fn self_signatures(&self) -> &[Signature] { + &self.self_signatures } /// Any third-party certifications. @@ -290,7 +290,7 @@ impl<C> ComponentBinding<C> { { let p : Packet = self.component.into(); std::iter::once(p) - .chain(self.selfsigs.into_iter().map(|s| s.into())) + .chain(self.self_signatures.into_iter().map(|s| s.into())) .chain(self.certifications.into_iter().map(|s| s.into())) .chain(self.self_revocations.into_iter().map(|s| s.into())) .chain(self.other_revocations.into_iter().map(|s| s.into())) @@ -308,8 +308,8 @@ impl<C> ComponentBinding<C> { // kept is undefined. fn sort_and_dedup(&mut self) { - self.selfsigs.sort_by(sig_cmp); - self.selfsigs.dedup(); + self.self_signatures.sort_by(sig_cmp); + self.self_signatures.dedup(); // There is no need to sort the certifications, but we do // want to remove dups and sorting is a prerequisite. @@ -868,7 +868,7 @@ impl<C> ComponentBindings<C> merge(&mut a.component, &mut b.component); // Recall: if a and b are equal, a will be dropped. - b.selfsigs.append(&mut a.selfsigs); + b.self_signatures.append(&mut a.self_signatures); b.certifications.append(&mut a.certifications); b.self_revocations.append(&mut a.self_revocations); b.other_revocations.append(&mut a.self_revocations); @@ -1171,7 +1171,7 @@ impl TPK { /// All revocations are validated, and they are sorted by their /// creation time. pub fn direct_signatures(&self) -> &[Signature] { - &self.primary.selfsigs + &self.primary.self_signatures } /// Third-party certifications. @@ -1548,14 +1548,14 @@ impl TPK { } check!("primary key", - self.primary, selfsigs, verify_primary_key_binding); + self.primary, self_signatures, verify_primary_key_binding); check!("primary key", self.primary, self_revocations, verify_primary_key_revocation); for binding in self.userids.iter_mut() { check!(format!("userid \"{}\"", String::from_utf8_lossy(binding.userid().value())), - binding, selfsigs, verify_userid_binding, + binding, self_signatures, verify_userid_binding, binding.userid()); check!(format!("userid \"{}\"", String::from_utf8_lossy(binding.userid().value())), @@ -1565,7 +1565,7 @@ impl TPK { for binding in self.user_attributes.iter_mut() { check!("user attribute", - binding, selfsigs, verify_user_attribute_binding, + binding, self_signatures, verify_user_attribute_binding, binding.user_attribute()); check!("user attribute", binding, self_revocations, verify_user_attribute_revocation, @@ -1574,7 +1574,7 @@ impl TPK { for binding in self.subkeys.iter_mut() { check!(format!("subkey {}", binding.key().keyid()), - binding, selfsigs, verify_subkey_binding, + binding, self_signatures, verify_subkey_binding, binding.key()); check!(format!("subkey {}", binding.key().keyid()), binding, self_revocations, verify_subkey_revocation, @@ -1612,7 +1612,7 @@ impl TPK { }); } - check_one!("primary key", self.primary.selfsigs, sig, + check_one!("primary key", self.primary.self_signatures, sig, verify_primary_key_binding); check_one!("primary key", self.primary.self_revocations, sig, verify_primary_key_revocation); @@ -1621,7 +1621,7 @@ impl TPK { check_one!(format!("userid \"{}\"", String::from_utf8_lossy( binding.userid().value())), - binding.selfsigs, sig, + binding.self_signatures, sig, verify_userid_binding, binding.userid()); check_one!(format!("userid \"{}\"", String::from_utf8_lossy( @@ -1632,7 +1632,7 @@ impl TPK { for binding in self.user_attributes.iter_mut() { check_one!("user attribute", - binding.selfsigs, sig, + binding.self_signatures, sig, verify_user_attribute_binding, binding.user_attribute()); check_one!("user attribute", @@ -1643,7 +1643,7 @@ impl TPK { for binding in self.subkeys.iter_mut() { check_one!(format!("subkey {}", binding.key().keyid()), - binding.selfsigs, sig, + binding.self_signatures, sig, verify_subkey_binding, binding.key()); check_one!(format!("subkey {}", binding.key().keyid()), binding.self_revocations, sig, @@ -1666,17 +1666,17 @@ impl TPK { // Only keep user ids / user attributes / subkeys with at // least one valid self-signature or self-revocation. self.userids.retain(|userid| { - userid.selfsigs.len() > 0 || userid.self_revocations.len() > 0 + userid.self_signatures.len() > 0 || userid.self_revocations.len() > 0 }); t!("Retained {} userids", self.userids.len()); self.user_attributes.retain(|ua| { - ua.selfsigs.len() > 0 || ua.self_revocations.len() > 0 + ua.self_signatures.len() > 0 || ua.self_revocations.len() > 0 }); t!("Retained {} user_attributes", self.user_attributes.len()); self.subkeys.retain(|subkey| { - subkey.selfsigs.len() > 0 || subkey.self_revocations.len() > 0 + subkey.self_signatures.len() > 0 || subkey.self_revocations.len() > 0 }); t!("Retained {} subkeys", self.subkeys.len()); @@ -1788,8 +1788,8 @@ impl TPK { self.primary.key_mut().set_secret(other.primary.key_mut().set_secret(None)); } - self.primary.selfsigs.append( - &mut other.primary.selfsigs); + self.primary.self_signatures.append( + &mut other.primary.self_signatures); self.primary.certifications.append( &mut other.primary.certifications); self.primary.self_revocations.append( @@ -1870,8 +1870,8 @@ mod test { assert_eq!(tpk.userids.len(), 1); assert_eq!(tpk.userids[0].userid().value(), &b"Testy McTestface <testy@example.org>"[..]); - assert_eq!(tpk.userids[0].selfsigs.len(), 1); - assert_eq!(tpk.userids[0].selfsigs[0].hash_prefix(), + assert_eq!(tpk.userids[0].self_signatures.len(), 1); + assert_eq!(tpk.userids[0].self_signatures[0].hash_prefix(), &[ 0xc6, 0x8f ]); assert_eq!(tpk.user_attributes.len(), 0); assert_eq!(tpk.subkeys.len(), 0); @@ -1891,8 +1891,8 @@ mod test { assert_eq!(tpk.userids.len(), 1, "number of userids"); assert_eq!(tpk.userids[0].userid().value(), &b"Testy McTestface <testy@example.org>"[..]); - assert_eq!(tpk.userids[0].selfsigs.len(), 1); - assert_eq!(tpk.userids[0].selfsigs[0].hash_prefix(), + assert_eq!(tpk.userids[0].self_signatures.len(), 1); + assert_eq!(tpk.userids[0].self_signatures[0].hash_prefix(), &[ 0xc6, 0x8f ]); assert_eq!(tpk.user_attributes.len(), 0); @@ -1900,7 +1900,7 @@ mod test { assert_eq!(tpk.subkeys.len(), 1, "number of subkeys"); assert_eq!(tpk.subkeys[0].key().creation_time().to_pgp().unwrap(), 1511355130); - assert_eq!(tpk.subkeys[0].selfsigs[0].hash_prefix(), + assert_eq!(tpk.subkeys[0].self_signatures[0].hash_prefix(), &[ 0xb7, 0xb9 ]); let tpk = parse_tpk(crate::tests::key("testy-no-subkey.pgp"), @@ -1914,8 +1914,8 @@ mod test { assert_eq!(tpk.userids.len(), 1, "number of userids"); assert_eq!(tpk.userids[0].userid().value(), &b"Testy McTestface <testy@example.org>"[..]); - assert_eq!(tpk.userids[0].selfsigs.len(), 1); - assert_eq!(tpk.userids[0].selfsigs[0].hash_prefix(), + assert_eq!(tpk.userids[0].self_signatures.len(), 1); + assert_eq!(tpk.userids[0].self_signatures[0].hash_prefix(), &[ 0xc6, 0x8f ]); assert_eq!(tpk.subkeys.len(), 0, "number of subkeys"); @@ -2054,20 +2054,20 @@ mod test { .unwrap(); assert!(tpk_donald_signs_base.userids.len() == 1); - assert!(tpk_donald_signs_base.userids[0].selfsigs.len() == 1); + assert!(tpk_donald_signs_base.userids[0].self_signatures.len() == 1); assert!(tpk_base.userids[0].certifications.len() == 0); assert!(tpk_donald_signs_base.userids[0].certifications.len() == 1); let merged = tpk_donald_signs_base.clone() .merge(tpk_ivanka_signs_base.clone()).unwrap(); assert!(merged.userids.len() == 1); - assert!(merged.userids[0].selfsigs.len() == 1); + assert!(merged.userids[0].self_signatures.len() == 1); assert!(merged.userids[0].certifications.len() == 2); let merged = tpk_donald_signs_base.clone() .merge(tpk_donald_signs_all.clone()).unwrap(); assert!(merged.userids.len() == 3); - assert!(merged.userids[0].selfsigs.len() == 1); + assert!(merged.userids[0].self_signatures.len() == 1); // There should be two certifications from the Donald on the // first user id. assert!(merged.userids[0].certifications.len() == 2); @@ -2079,7 +2079,7 @@ mod test { .merge(tpk_ivanka_signs_base.clone()).unwrap() .merge(tpk_ivanka_signs_all.clone()).unwrap(); assert!(merged.userids.len() == 3); - assert!(merged.userids[0].selfsigs.len() == 1); + assert!(merged.userids[0].self_signatures.len() == 1); // There should be two certifications from each of the Donald // and Ivanka on the first user id, and one each on the rest. assert!(merged.userids[0].certifications.len() == 4); @@ -2097,7 +2097,7 @@ mod test { .merge(tpk_donald_signs_all.clone()).unwrap() .merge(tpk_ivanka_signs_all.clone()).unwrap(); assert!(merged.userids.len() == 3); - assert!(merged.userids[0].selfsigs.len() == 1); + assert!(merged.userids[0].self_signatures.len() == 1); // There should be two certifications from each of the Donald // and Ivanka on the first user id, and one each on the rest. assert!(merged.userids[0].certifications.len() == 4); @@ -3059,10 +3059,10 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= let uidb = neal.userids().nth(0).unwrap(); // Signatures are sorted in ascending order wrt the signature // creation time. - assert!(uidb.selfsigs()[0].signature_creation_time() - < uidb.selfsigs()[1].signature_creation_time()); + assert!(uidb.self_signatures()[0].signature_creation_time() + < uidb.self_signatures()[1].signature_creation_time()); // Make sure we return the most recent here. - assert_eq!(uidb.selfsigs().last().unwrap(), + assert_eq!(uidb.self_signatures().last().unwrap(), uidb.binding_signature(None).unwrap()); } diff --git a/openpgp/src/tpk/parser/low_level/grammar.lalrpop b/openpgp/src/tpk/parser/low_level/grammar.lalrpop index 88937b09..1f22ac17 100644 --- a/openpgp/src/tpk/parser/low_level/grammar.lalrpop +++ b/openpgp/src/tpk/parser/low_level/grammar.lalrpop @@ -48,7 +48,7 @@ pub TPK: Option<TPK> = { let mut tpk = TPK { primary: PrimaryKeyBinding { component: key, - selfsigs: vec![], + self_signatures: vec![], certifications: sigs, self_revocations: vec![], other_revocations: vec![], @@ -159,7 +159,7 @@ Component: Option<Component> = { Some(Component::SubkeyBinding(SubkeyBinding { component: key, - selfsigs: vec![], + self_signatures: vec![], certifications: sigs, self_revocations: vec![], other_revocations: vec![], @@ -176,7 +176,7 @@ Component: Option<Component> = { Some(Component::UserIDBinding(UserIDBinding { component: u, - selfsigs: vec![], + self_signatures: vec![], certifications: sigs, self_revocations: vec![], other_revocations: vec![], @@ -193,7 +193,7 @@ Component: Option<Component> = { Some(Component::UserAttributeBinding(UserAttributeBinding { component: u, - selfsigs: vec![], + self_signatures: vec![], certifications: sigs, self_revocations: vec![], other_revocations: vec![], @@ -210,7 +210,7 @@ Component: Option<Component> = { Some(Component::UnknownBinding(UnknownBinding { component: u, - selfsigs: vec![], + self_signatures: vec![], certifications: sigs, self_revocations: vec![], other_revocations: vec![], diff --git a/openpgp/src/tpk/parser/mod.rs b/openpgp/src/tpk/parser/mod.rs index e953c632..635fd5cf 100644 --- a/openpgp/src/tpk/parser/mod.rs +++ b/openpgp/src/tpk/parser/mod.rs @@ -620,7 +620,7 @@ impl<'a, I: Iterator<Item=Packet>> TPKParser<'a, I> { fn split_sigs<C>(primary: &Fingerprint, primary_keyid: &KeyID, b: &mut ComponentBinding<C>) { - let mut selfsigs = vec![]; + let mut self_signatures = vec![]; let mut certifications = vec![]; let mut self_revs = vec![]; let mut other_revs = vec![]; @@ -650,7 +650,7 @@ impl<'a, I: Iterator<Item=Packet>> TPKParser<'a, I> { } } else { if is_selfsig { - selfsigs.push(sig.into()); + self_signatures.push(sig.into()); } else { certifications.push(sig.into()); } @@ -659,7 +659,7 @@ impl<'a, I: Iterator<Item=Packet>> TPKParser<'a, I> { } } - b.selfsigs = selfsigs; + b.self_signatures = self_signatures; b.certifications = certifications; b.self_revocations = self_revs; b.other_revocations = other_revs; |