diff options
| author | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-10-20 10:11:23 +0200 |
|---|---|---|
| committer | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-12-01 14:55:56 +0100 |
| commit | d40cd05ece363d49fad83f0d37b7f7a01090a585 (patch) | |
| tree | 0d5c43bb5d67a22942e64b14ddaf915ed97531d8 /openpgp/src/cert.rs | |
| parent | 6e3cc5e9e95d18ffc180138415c5372d7b514fa8 (diff) | |
openpgp: Allow using `None` to indicate signer's key should be used as the `key` parameter.
- Make sign_direct_key take Key of key::PublicParts.
- Simplify calling sign_direct_key by using Into.
- Allow passing None to sign_subkey_binding.
- Allow passing None to sign_userid_binding.
- Allow using None as key parameter.
- Improve docs mentioning new default for `pk`.
- `pk` set to `Option::None` will now default to signer's public key.
- Fixes #565.
Diffstat (limited to 'openpgp/src/cert.rs')
| -rw-r--r-- | openpgp/src/cert.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openpgp/src/cert.rs b/openpgp/src/cert.rs index 29782b44..1202ae5f 100644 --- a/openpgp/src/cert.rs +++ b/openpgp/src/cert.rs @@ -4438,13 +4438,13 @@ mod test { .set_signature_creation_time(t1).unwrap() .set_key_validity_period(Some(time::Duration::new(10 * 52 * 7 * 24 * 60 * 60, 0))).unwrap() .set_preferred_hash_algorithms(vec![HashAlgorithm::SHA512]).unwrap() - .sign_direct_key(&mut pair, &key).unwrap(); + .sign_direct_key(&mut pair, key.parts_as_public()).unwrap(); let rev1 = signature::SignatureBuilder::new(SignatureType::KeyRevocation) .set_signature_creation_time(t2).unwrap() .set_reason_for_revocation(ReasonForRevocation::KeySuperseded, &b""[..]).unwrap() - .sign_direct_key(&mut pair, &key).unwrap(); + .sign_direct_key(&mut pair, key.parts_as_public()).unwrap(); let bind2 = signature::SignatureBuilder::new(SignatureType::DirectKey) .set_features(&Features::sequoia()).unwrap() @@ -4452,13 +4452,13 @@ mod test { .set_signature_creation_time(t3).unwrap() .set_key_validity_period(Some(time::Duration::new(10 * 52 * 7 * 24 * 60 * 60, 0))).unwrap() .set_preferred_hash_algorithms(vec![HashAlgorithm::SHA512]).unwrap() - .sign_direct_key(&mut pair, &key).unwrap(); + .sign_direct_key(&mut pair, key.parts_as_public()).unwrap(); let rev2 = signature::SignatureBuilder::new(SignatureType::KeyRevocation) .set_signature_creation_time(t4).unwrap() .set_reason_for_revocation(ReasonForRevocation::KeyCompromised, &b""[..]).unwrap() - .sign_direct_key(&mut pair, &key).unwrap(); + .sign_direct_key(&mut pair, key.parts_as_public()).unwrap(); (bind1, rev1, bind2, rev2) }; @@ -5125,7 +5125,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= .unwrap() .set_preferred_hash_algorithms(vec![HashAlgorithm::SHA512]).unwrap() .set_signature_creation_time(*t).unwrap() - .sign_direct_key(&mut pair, &key).unwrap(); + .sign_direct_key(&mut pair, key.parts_as_public()).unwrap(); let binding : Packet = binding.into(); |