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 /sqv | |
| 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 'sqv')
| -rw-r--r-- | sqv/tests/revoked-key.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sqv/tests/revoked-key.rs b/sqv/tests/revoked-key.rs index 44e41e41..404092e1 100644 --- a/sqv/tests/revoked-key.rs +++ b/sqv/tests/revoked-key.rs @@ -305,7 +305,7 @@ fn create_key() { let uid_binding = signature::SignatureBuilder::new(SignatureType::PositiveCertification) .set_signature_creation_time(t1).unwrap() - .sign_userid_binding(&mut signer, &key, &uid).unwrap(); + .sign_userid_binding(&mut signer, None, &uid).unwrap(); // Create subkey. let mut subkey: Key<_, SubordinateRole> = make_key().into(); @@ -320,7 +320,7 @@ fn create_key() { .set_signature_creation_time(t1).unwrap() .set_preferred_hash_algorithms(vec![HashAlgorithm::SHA512]) .unwrap(); - let direct1 = b.sign_direct_key(&mut signer, &key).unwrap(); + let direct1 = b.sign_direct_key(&mut signer, None).unwrap(); // 1st subkey binding signature valid from t_sk_binding on b = signature::SignatureBuilder::new(SignatureType::SubkeyBinding) @@ -331,7 +331,7 @@ fn create_key() { .set_signature_creation_time(t_sk_binding).unwrap() .sign_primary_key_binding(&mut sk_signer, &key, &subkey).unwrap()) .unwrap(); - let sk_bind1 = b.sign_subkey_binding(&mut signer, &key, &subkey).unwrap(); + let sk_bind1 = b.sign_subkey_binding(&mut signer, None, &subkey).unwrap(); // 2nd direct key signature valid from t3 on b = signature::SignatureBuilder::new(SignatureType::DirectKey) @@ -341,7 +341,7 @@ fn create_key() { .set_signature_creation_time(t3).unwrap() .set_preferred_hash_algorithms(vec![HashAlgorithm::SHA512]) .unwrap(); - let direct2 = b.sign_direct_key(&mut signer, &key).unwrap(); + let direct2 = b.sign_direct_key(&mut signer, None).unwrap(); // 2nd subkey binding signature valid from t3 on let mut b = signature::SignatureBuilder::new(SignatureType::SubkeyBinding) @@ -352,7 +352,7 @@ fn create_key() { .set_signature_creation_time(t3).unwrap() .sign_primary_key_binding(&mut sk_signer, &key, &subkey).unwrap()) .unwrap(); - let sk_bind2 = b.sign_subkey_binding(&mut signer, &key, &subkey).unwrap(); + let sk_bind2 = b.sign_subkey_binding(&mut signer, None, &subkey).unwrap(); let cert = Cert::try_from(vec![ key.clone().into(), @@ -386,7 +386,7 @@ fn create_key() { .unwrap(); } - let rev = b.sign_direct_key(&mut signer, &key).unwrap(); + let rev = b.sign_direct_key(&mut signer, None).unwrap(); let cert = Cert::try_from(vec![ key.clone().into(), direct1.clone().into(), @@ -413,7 +413,7 @@ fn create_key() { .unwrap(); } - let rev = b.sign_subkey_binding(&mut signer, &key, &subkey).unwrap(); + let rev = b.sign_subkey_binding(&mut signer, None, &subkey).unwrap(); let cert = Cert::try_from(vec![ key.clone().into(), direct1.clone().into(), |