diff options
Diffstat (limited to 'openpgp/src/serialize/stream.rs')
| -rw-r--r-- | openpgp/src/serialize/stream.rs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs index ba2c91a7..88c301ea 100644 --- a/openpgp/src/serialize/stream.rs +++ b/openpgp/src/serialize/stream.rs @@ -228,8 +228,9 @@ impl<'a> Signer<'a> { /// # let tsk = Cert::from_bytes(&include_bytes!( /// # "../../tests/data/keys/testy-new-private.pgp")[..]) /// # .unwrap(); - /// # let keypair = tsk.keys().alive().revoked(false).for_signing().nth(0).unwrap().key() - /// # .clone().mark_parts_secret().unwrap().into_keypair().unwrap(); + /// # let keypair = tsk.keys().policy(None).alive().revoked(false).for_signing() + /// # .nth(0).unwrap() + /// # .key().clone().mark_parts_secret().unwrap().into_keypair().unwrap(); /// # f(tsk, keypair).unwrap(); /// # fn f(cert: Cert, mut signing_keypair: KeyPair) /// # -> Result<()> { @@ -332,7 +333,8 @@ impl<'a> Signer<'a> { /// # "../../tests/data/keys/testy-new-private.pgp")[..]) /// # .unwrap(); /// # let keypair - /// # = tsk.keys().alive().revoked(false).for_signing().nth(0).unwrap() + /// # = tsk.keys().policy(None).alive().revoked(false).for_signing() + /// # .nth(0).unwrap() /// # .key().clone().mark_parts_secret().unwrap().into_keypair() /// # .unwrap(); /// # f(tsk, keypair).unwrap(); @@ -985,7 +987,7 @@ impl<'a> Encryptor<'a> { /// /// // Build a vector of recipients to hand to Encryptor. /// let recipient = - /// cert.keys().alive().revoked(false) + /// cert.keys().policy(None).alive().revoked(false) /// .key_flags(KeyFlags::default() /// .set_storage_encryption(true) /// .set_transport_encryption(true)) @@ -1470,7 +1472,8 @@ mod test { Cert::from_bytes(crate::tests::key("testy-private.pgp")).unwrap(), Cert::from_bytes(crate::tests::key("testy-new-private.pgp")).unwrap(), ] { - for key in tsk.keys().for_signing().map(|ka| ka.key()) { + for key in tsk.keys().policy(None).for_signing().map(|ka| ka.key()) + { keys.insert(key.fingerprint(), key.clone()); } } @@ -1674,7 +1677,7 @@ mod test { mut decrypt: D) -> Result<Option<crate::Fingerprint>> where D: FnMut(SymmetricAlgorithm, &SessionKey) -> Result<()> { - let mut keypair = self.tsk.keys() + let mut keypair = self.tsk.keys().policy(None) .key_flags( KeyFlags::default().set_transport_encryption(true)) .map(|ka| ka.key()).next().unwrap() @@ -1701,8 +1704,8 @@ mod test { let mut msg = vec![]; { let m = Message::new(&mut msg); - let recipient = - tsk.keys() + let recipient = tsk + .keys().policy(None) .key_flags(KeyFlags::default() .set_storage_encryption(true) .set_transport_encryption(true)) |