diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2019-12-03 17:50:12 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2019-12-04 13:21:47 +0100 |
commit | 8354d849b19170a9a2c2b97179d9aaedb6fca6cf (patch) | |
tree | 12578d07af9c4d104571e1055e1d40af4eae99ed /openpgp/src/parse | |
parent | 807eee2432de52715a2e3c7167d5e859ca3315a8 (diff) |
openpgp: Rename KeyFlag's accessors.
- Fixes #359.
Diffstat (limited to 'openpgp/src/parse')
-rw-r--r-- | openpgp/src/parse/parse.rs | 2 | ||||
-rw-r--r-- | openpgp/src/parse/stream.rs | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/openpgp/src/parse/parse.rs b/openpgp/src/parse/parse.rs index 79d09137..ac484e42 100644 --- a/openpgp/src/parse/parse.rs +++ b/openpgp/src/parse/parse.rs @@ -1010,7 +1010,7 @@ impl Signature4 { unhashed_area_len as usize)); let hash_prefix1 = php_try!(php.parse_u8("hash_prefix1")); let hash_prefix2 = php_try!(php.parse_u8("hash_prefix2")); - if ! pk_algo.can_sign() { + if ! pk_algo.for_signing() { return php.fail("not a signature algorithm"); } let mpis = php_try!( diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs index 4b632601..272fc78f 100644 --- a/openpgp/src/parse/stream.rs +++ b/openpgp/src/parse/stream.rs @@ -560,13 +560,13 @@ impl<'a, H: VerificationHelper> Verifier<'a, H> { let time = time .unwrap_or_else(|| time::SystemTime::now()); - fn can_sign<P, R>(key: &Key<P, R>, sig: Option<&Signature>, - time: time::SystemTime, tolerance: time::Duration) + fn for_signing<P, R>(key: &Key<P, R>, sig: Option<&Signature>, + time: time::SystemTime, tolerance: time::Duration) -> bool where P: key::KeyParts, R: key::KeyRole { if let Some(sig) = sig { - sig.key_flags().can_sign() + sig.key_flags().for_signing() // Check expiry. && sig.signature_alive(time, tolerance) && sig.key_alive(key, time) @@ -608,17 +608,17 @@ impl<'a, H: VerificationHelper> Verifier<'a, H> { v.certs = v.helper.get_public_keys(&issuers)?; for (i, cert) in v.certs.iter().enumerate() { - if can_sign(cert.primary(), - cert.primary_key_signature(None), - time, tolerance) { + if for_signing(cert.primary(), + cert.primary_key_signature(None), + time, tolerance) { v.keys.insert(cert.fingerprint().into(), (i, 0)); v.keys.insert(cert.keyid().into(), (i, 0)); } for (j, skb) in cert.subkeys().enumerate() { let key = skb.key(); - if can_sign(key, skb.binding_signature(None), - time, tolerance) { + if for_signing(key, skb.binding_signature(None), + time, tolerance) { v.keys.insert(key.fingerprint().into(), (i, j + 1)); v.keys.insert(key.keyid().into(), @@ -1433,11 +1433,11 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> { v.certs = v.helper.get_public_keys(&issuers)?; for (i, cert) in v.certs.iter().enumerate() { - let can_sign = |key: &key::UnspecifiedKey, + let for_signing = |key: &key::UnspecifiedKey, sig: Option<&Signature>| -> bool { if let Some(sig) = sig { - sig.key_flags().can_sign() + sig.key_flags().for_signing() // Check expiry. && sig.signature_alive(time, tolerance) && sig.key_alive(key, time) @@ -1446,7 +1446,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> { } }; - if can_sign(cert.primary().into(), + if for_signing(cert.primary().into(), cert.primary_key_signature(None)) { v.keys.insert(cert.fingerprint().into(), (i, 0)); v.keys.insert(cert.keyid().into(), (i, 0)); @@ -1454,7 +1454,7 @@ impl<'a, H: VerificationHelper + DecryptionHelper> Decryptor<'a, H> { for (j, skb) in cert.subkeys().enumerate() { let key = skb.key(); - if can_sign(key.into(), skb.binding_signature(None)) { + if for_signing(key.into(), skb.binding_signature(None)) { v.keys.insert(key.fingerprint().into(), (i, j + 1)); v.keys.insert(key.keyid().into(), |