diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2020-01-20 16:00:56 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2020-01-21 12:52:53 +0100 |
| commit | 39d1b90b30a40e1f115baaadff8ff4067960a242 (patch) | |
| tree | 173c10d3dfa374bf3c48b441faccfc5823697f8a /openpgp | |
| parent | 9e4c2e222edb4583b50b11ca7911add494fc9e64 (diff) | |
openpgp: Reduce use of Cert::primary_key_signature.
Diffstat (limited to 'openpgp')
| -rw-r--r-- | openpgp/src/cert/builder.rs | 11 | ||||
| -rw-r--r-- | openpgp/src/packet/signature/mod.rs | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/openpgp/src/cert/builder.rs b/openpgp/src/cert/builder.rs index c5adc427..e5144ef2 100644 --- a/openpgp/src/cert/builder.rs +++ b/openpgp/src/cert/builder.rs @@ -499,14 +499,11 @@ mod tests { .generate().unwrap(); assert_eq!(cert.userids().count(), 0); - assert_eq!(cert.primary_key_signature(None).unwrap().typ(), - crate::types::SignatureType::DirectKey); assert_eq!(cert.subkeys().count(), 3); - if let Some(sig) = cert.primary_key_signature(None) { - assert!(sig.features().supports_mdc()); - } else { - panic!(); - } + let sig = + cert.keys().primary(None).unwrap().binding_signature(); + assert_eq!(sig.typ(), crate::types::SignatureType::DirectKey); + assert!(sig.features().supports_mdc()); } #[test] diff --git a/openpgp/src/packet/signature/mod.rs b/openpgp/src/packet/signature/mod.rs index 78e98347..c7eb2e7d 100644 --- a/openpgp/src/packet/signature/mod.rs +++ b/openpgp/src/packet/signature/mod.rs @@ -1384,8 +1384,8 @@ mod test { .unwrap(); let test2 = Cert::from_bytes( crate::tests::key("test2-signed-by-test1.pgp")).unwrap(); - let uid_binding = &test2.primary_key_signature_full(None) - .unwrap().1.unwrap().0; + let uid_binding = + test2.userids().policy(None).nth(0).unwrap().binding(); let cert = &uid_binding.certifications()[0]; cert.verify_userid_binding(cert_key1, |