diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-05-28 22:21:47 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-05-30 12:09:47 +0200 |
| commit | be8bf91c14485a844a2c6143893105a21fd6f26e (patch) | |
| tree | b2e632196964ebe6e94fb709b77d24d031c0ea2f /guide | |
| parent | a0378343f6f0d311021437435c14670a6d7dc3e2 (diff) | |
openpgp: Make PKESK::decrypt use crypto::Decryptor.
Diffstat (limited to 'guide')
| -rw-r--r-- | guide/src/chapter_02.md | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/guide/src/chapter_02.md b/guide/src/chapter_02.md index f66e15b3..06d38342 100644 --- a/guide/src/chapter_02.md +++ b/guide/src/chapter_02.md @@ -121,11 +121,11 @@ fn main() { # let key = self.secret.subkeys().nth(0) # .map(|binding| binding.subkey().clone()) # .unwrap(); -# +# # // The secret key is not encrypted. -# let pair = key.into_keypair().unwrap(); -# -# pkesks[0].decrypt(pair.public(), pair.secret()) +# let mut pair = key.into_keypair().unwrap(); +# +# pkesks[0].decrypt(&mut pair) # .and_then(|(algo, session_key)| decrypt(algo, &session_key)) # .map(|_| None) # // XXX: In production code, return the Fingerprint of the @@ -255,11 +255,11 @@ fn generate() -> openpgp::Result<openpgp::TPK> { # let key = self.secret.subkeys().nth(0) # .map(|binding| binding.subkey().clone()) # .unwrap(); -# +# # // The secret key is not encrypted. -# let pair = key.into_keypair().unwrap(); -# -# pkesks[0].decrypt(pair.public(), pair.secret()) +# let mut pair = key.into_keypair().unwrap(); +# +# pkesks[0].decrypt(&mut pair) # .and_then(|(algo, session_key)| decrypt(algo, &session_key)) # .map(|_| None) # // XXX: In production code, return the Fingerprint of the @@ -389,11 +389,11 @@ fn encrypt(sink: &mut Write, plaintext: &str, recipient: &openpgp::TPK) # let key = self.secret.subkeys().nth(0) # .map(|binding| binding.subkey().clone()) # .unwrap(); -# +# # // The secret key is not encrypted. -# let pair = key.into_keypair().unwrap(); -# -# pkesks[0].decrypt(pair.public(), pair.secret()) +# let mut pair = key.into_keypair().unwrap(); +# +# pkesks[0].decrypt(&mut pair) # .and_then(|(algo, session_key)| decrypt(algo, &session_key)) # .map(|_| None) # // XXX: In production code, return the Fingerprint of the @@ -539,9 +539,9 @@ impl<'a> DecryptionHelper for Helper<'a> { .unwrap(); // The secret key is not encrypted. - let pair = key.into_keypair().unwrap(); + let mut pair = key.into_keypair().unwrap(); - pkesks[0].decrypt(pair.public(), pair.secret()) + pkesks[0].decrypt(&mut pair) .and_then(|(algo, session_key)| decrypt(algo, &session_key)) .map(|_| None) // XXX: In production code, return the Fingerprint of the |