From 01db33b99244294702f0f58f06c6736becee28db Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 18 Mar 2019 12:44:36 +0100 Subject: openpgp: Make hash algorithm configurable in streaming Signer. - See #208. --- tool/src/commands/mod.rs | 3 ++- tool/src/commands/sign.rs | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'tool/src') diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs index 076bafbc..b5deb4a9 100644 --- a/tool/src/commands/mod.rs +++ b/tool/src/commands/mod.rs @@ -116,7 +116,8 @@ pub fn encrypt(store: &mut store::Store, sink, signers.iter_mut().map(|s| -> &mut dyn crypto::Signer { s }) .collect(), - &recipients)?; + &recipients, + None)?; } let mut literal_writer = LiteralWriter::new(sink, DataFormat::Binary, diff --git a/tool/src/commands/sign.rs b/tool/src/commands/sign.rs index 119e66e3..b9832035 100644 --- a/tool/src/commands/sign.rs +++ b/tool/src/commands/sign.rs @@ -97,9 +97,9 @@ fn sign_data(input: &mut io::Read, output_path: Option<&str>, let sink = Message::new(output); let signer = if detached { - Signer::detached(sink, signers) + Signer::detached(sink, signers, None) } else { - Signer::new(sink, signers) + Signer::new(sink, signers, None) }.context("Failed to create signer")?; let mut writer = if detached { @@ -215,7 +215,7 @@ fn sign_message(input: &mut io::Read, output_path: Option<&str>, // After the first signature group, we push the signer // onto the writer stack. let signers = signers.take().expect("only happens once"); - sink = Signer::new(sink, signers) + sink = Signer::new(sink, signers, None) .context("Failed to create signer")?; state = State::Signing { signature_count: 0, }; }, -- cgit v1.2.3