diff options
Diffstat (limited to 'guide/src/chapter_02.md')
| -rw-r--r-- | guide/src/chapter_02.md | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/guide/src/chapter_02.md b/guide/src/chapter_02.md index 88dfe1d7..1d55e6d9 100644 --- a/guide/src/chapter_02.md +++ b/guide/src/chapter_02.md @@ -134,11 +134,12 @@ fn main() { # where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> # { # // The encryption key is the first and only subkey. -# let key = self.secret.keys().with_policy(self.policy, None) +# let key = self.secret.keys().unencrypted_secret() +# .with_policy(self.policy, None) # .for_transport_encryption().nth(0).unwrap().key().clone(); # # // The secret key is not encrypted. -# let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap(); +# let mut pair = key.into_keypair().unwrap(); # # pkesks[0].decrypt(&mut pair, sym_algo) # .and_then(|(algo, session_key)| decrypt(algo, &session_key)) @@ -283,11 +284,12 @@ fn generate() -> openpgp::Result<openpgp::Cert> { # where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> # { # // The encryption key is the first and only subkey. -# let key = self.secret.keys().with_policy(self.policy, None) +# let key = self.secret.keys().unencrypted_secret() +# .with_policy(self.policy, None) # .for_transport_encryption().nth(0).unwrap().key().clone(); # # // The secret key is not encrypted. -# let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap(); +# let mut pair = key.into_keypair().unwrap(); # # pkesks[0].decrypt(&mut pair, sym_algo) # .and_then(|(algo, session_key)| decrypt(algo, &session_key)) @@ -432,11 +434,12 @@ fn encrypt(policy: &dyn Policy, # where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> # { # // The encryption key is the first and only subkey. -# let key = self.secret.keys().with_policy(self.policy, None) +# let key = self.secret.keys().unencrypted_secret() +# .with_policy(self.policy, None) # .for_transport_encryption().nth(0).unwrap().key().clone(); # # // The secret key is not encrypted. -# let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap(); +# let mut pair = key.into_keypair().unwrap(); # # pkesks[0].decrypt(&mut pair, sym_algo) # .and_then(|(algo, session_key)| decrypt(algo, &session_key)) @@ -594,11 +597,13 @@ impl<'a> DecryptionHelper for Helper<'a> { -> openpgp::Result<Option<openpgp::Fingerprint>> where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> { - let key = self.secret.keys().with_policy(self.policy, None) + // The encryption key is the first and only subkey. + let key = self.secret.keys().unencrypted_secret() + .with_policy(self.policy, None) .for_transport_encryption().nth(0).unwrap().key().clone(); // The secret key is not encrypted. - let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap(); + let mut pair = key.into_keypair().unwrap(); pkesks[0].decrypt(&mut pair, sym_algo) .and_then(|(algo, session_key)| decrypt(algo, &session_key)) |