diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2019-03-18 12:44:36 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2019-03-18 14:03:58 +0100 |
commit | 01db33b99244294702f0f58f06c6736becee28db (patch) | |
tree | 0cedce9f950866e1f355787be82a712bcf581ac4 /tool/src | |
parent | fc387f5c290774a39feff97cde31ea78300d2b23 (diff) |
openpgp: Make hash algorithm configurable in streaming Signer.
- See #208.
Diffstat (limited to 'tool/src')
-rw-r--r-- | tool/src/commands/mod.rs | 3 | ||||
-rw-r--r-- | tool/src/commands/sign.rs | 6 |
2 files changed, 5 insertions, 4 deletions
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, }; }, |