From a6ff2539d4fcb569eba07c38d3ca992c266bdc57 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 12 Feb 2020 13:36:22 +0100 Subject: openpgp: Add optional cipher argument to DecryptionHelper::decrypt. --- guide/src/chapter_02.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'guide') diff --git a/guide/src/chapter_02.md b/guide/src/chapter_02.md index 8eda8284..88dfe1d7 100644 --- a/guide/src/chapter_02.md +++ b/guide/src/chapter_02.md @@ -128,6 +128,7 @@ fn main() { # fn decrypt(&mut self, # pkesks: &[openpgp::packet::PKESK], # _skesks: &[openpgp::packet::SKESK], +# sym_algo: Option, # mut decrypt: D) # -> openpgp::Result> # where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> @@ -139,7 +140,7 @@ fn main() { # // The secret key is not encrypted. # let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap(); # -# pkesks[0].decrypt(&mut pair, None) +# pkesks[0].decrypt(&mut pair, sym_algo) # .and_then(|(algo, session_key)| decrypt(algo, &session_key)) # .map(|_| None) # // XXX: In production code, return the Fingerprint of the @@ -276,6 +277,7 @@ fn generate() -> openpgp::Result { # fn decrypt(&mut self, # pkesks: &[openpgp::packet::PKESK], # _skesks: &[openpgp::packet::SKESK], +# sym_algo: Option, # mut decrypt: D) # -> openpgp::Result> # where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> @@ -287,7 +289,7 @@ fn generate() -> openpgp::Result { # // The secret key is not encrypted. # let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap(); # -# pkesks[0].decrypt(&mut pair, None) +# pkesks[0].decrypt(&mut pair, sym_algo) # .and_then(|(algo, session_key)| decrypt(algo, &session_key)) # .map(|_| None) # // XXX: In production code, return the Fingerprint of the @@ -424,6 +426,7 @@ fn encrypt(policy: &dyn Policy, # fn decrypt(&mut self, # pkesks: &[openpgp::packet::PKESK], # _skesks: &[openpgp::packet::SKESK], +# sym_algo: Option, # mut decrypt: D) # -> openpgp::Result> # where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> @@ -435,7 +438,7 @@ fn encrypt(policy: &dyn Policy, # // The secret key is not encrypted. # let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap(); # -# pkesks[0].decrypt(&mut pair, None) +# pkesks[0].decrypt(&mut pair, sym_algo) # .and_then(|(algo, session_key)| decrypt(algo, &session_key)) # .map(|_| None) # // XXX: In production code, return the Fingerprint of the @@ -586,6 +589,7 @@ impl<'a> DecryptionHelper for Helper<'a> { fn decrypt(&mut self, pkesks: &[openpgp::packet::PKESK], _skesks: &[openpgp::packet::SKESK], + sym_algo: Option, mut decrypt: D) -> openpgp::Result> where D: FnMut(SymmetricAlgorithm, &SessionKey) -> openpgp::Result<()> @@ -596,7 +600,7 @@ impl<'a> DecryptionHelper for Helper<'a> { // The secret key is not encrypted. let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap(); - pkesks[0].decrypt(&mut pair, None) + pkesks[0].decrypt(&mut pair, sym_algo) .and_then(|(algo, session_key)| decrypt(algo, &session_key)) .map(|_| None) // XXX: In production code, return the Fingerprint of the -- cgit v1.2.3