diff options
| author | Azul <azul@riseup.net> | 2020-11-28 10:20:37 +0100 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2020-12-01 16:23:26 +0100 |
| commit | 5c0cd1775fadc46e68a24a5af3d1f06803d69c4b (patch) | |
| tree | 27c9006288e21b2893258e7d7123894d1b8b8af3 /openpgp/src/cert.rs | |
| parent | d40cd05ece363d49fad83f0d37b7f7a01090a585 (diff) | |
openpgp: take ownership of KeyFlags bitfield
- Make `generate_key` polymorphic over `AsRef<KeyFlags>`.
- Since `set_key_flags` requires ownership of the key flags, it should
take ownership rather than borrowing and cloning the them.
See https://rust-lang.github.io/api-guidelines/flexibility.html#caller-decides-where-to-copy-and-place-data-c-caller-control .
- See #616.
Diffstat (limited to 'openpgp/src/cert.rs')
| -rw-r--r-- | openpgp/src/cert.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openpgp/src/cert.rs b/openpgp/src/cert.rs index 1202ae5f..2e25ad62 100644 --- a/openpgp/src/cert.rs +++ b/openpgp/src/cert.rs @@ -4434,7 +4434,7 @@ mod test { let (bind1, rev1, bind2, rev2) = { let bind1 = signature::SignatureBuilder::new(SignatureType::DirectKey) .set_features(&Features::sequoia()).unwrap() - .set_key_flags(&KeyFlags::empty()).unwrap() + .set_key_flags(KeyFlags::empty()).unwrap() .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() @@ -4448,7 +4448,7 @@ mod test { let bind2 = signature::SignatureBuilder::new(SignatureType::DirectKey) .set_features(&Features::sequoia()).unwrap() - .set_key_flags(&KeyFlags::empty()).unwrap() + .set_key_flags(KeyFlags::empty()).unwrap() .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() @@ -5117,7 +5117,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= for i in 0..N { let binding = signature::SignatureBuilder::new(SignatureType::DirectKey) .set_features(&Features::sequoia()).unwrap() - .set_key_flags(&KeyFlags::empty()).unwrap() + .set_key_flags(KeyFlags::empty()).unwrap() .set_signature_creation_time(t1).unwrap() // Vary this... .set_key_validity_period(Some( @@ -5383,7 +5383,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= key::Key4::generate_ecc(false, Curve::Cv25519)?.into(); let subkey_pub = subkey_sec.clone().take_secret().0; let builder = signature::SignatureBuilder::new(SignatureType::SubkeyBinding) - .set_key_flags(&KeyFlags::empty() + .set_key_flags(KeyFlags::empty() .set_transport_encryption())?; let binding = subkey_sec.bind(&mut primary_pair, &cert, builder)?; |