diff options
Diffstat (limited to 'openpgp/examples')
| -rw-r--r-- | openpgp/examples/encrypt-for.rs | 12 | ||||
| -rw-r--r-- | openpgp/examples/generate-encrypt-decrypt.rs | 8 | ||||
| -rw-r--r-- | openpgp/examples/notarize.rs | 12 | ||||
| -rw-r--r-- | openpgp/examples/pad.rs | 10 | ||||
| -rw-r--r-- | openpgp/examples/sign-detached.rs | 6 | ||||
| -rw-r--r-- | openpgp/examples/sign.rs | 8 | ||||
| -rw-r--r-- | openpgp/examples/wrap-literal.rs | 6 |
7 files changed, 30 insertions, 32 deletions
diff --git a/openpgp/examples/encrypt-for.rs b/openpgp/examples/encrypt-for.rs index 958c2095..3ec3ea9f 100644 --- a/openpgp/examples/encrypt-for.rs +++ b/openpgp/examples/encrypt-for.rs @@ -54,24 +54,22 @@ fn main() -> openpgp::Result<()> { // Stream an OpenPGP message. let message = Message::new(&mut sink); - let message = Armorer::new(message) - // Customize the `Armorer` here. - .build()?; + let message = Armorer::new(message).build()?; // We want to encrypt a literal data packet. - let encryptor = Encryptor::for_recipients(message, recipients) + let message = Encryptor::for_recipients(message, recipients) .build().context("Failed to create encryptor")?; - let mut literal_writer = LiteralWriter::new(encryptor).build() + let mut message = LiteralWriter::new(message).build() .context("Failed to create literal writer")?; // Copy stdin to our writer stack to encrypt the data. - io::copy(&mut io::stdin(), &mut literal_writer) + io::copy(&mut io::stdin(), &mut message) .context("Failed to encrypt")?; // Finally, finalize the OpenPGP message by tearing down the // writer stack. - literal_writer.finalize()?; + message.finalize()?; Ok(()) } diff --git a/openpgp/examples/generate-encrypt-decrypt.rs b/openpgp/examples/generate-encrypt-decrypt.rs index 1b1e267b..2ebe08ea 100644 --- a/openpgp/examples/generate-encrypt-decrypt.rs +++ b/openpgp/examples/generate-encrypt-decrypt.rs @@ -57,18 +57,18 @@ fn encrypt(p: &dyn Policy, sink: &mut dyn Write, plaintext: &str, let message = Message::new(sink); // We want to encrypt a literal data packet. - let encryptor = Encryptor::for_recipients(message, recipients) + let message = Encryptor::for_recipients(message, recipients) .build()?; // Emit a literal data packet. - let mut literal_writer = LiteralWriter::new(encryptor).build()?; + let mut message = LiteralWriter::new(message).build()?; // Encrypt the data. - literal_writer.write_all(plaintext.as_bytes())?; + message.write_all(plaintext.as_bytes())?; // Finalize the OpenPGP message to make sure that all data is // written. - literal_writer.finalize()?; + message.finalize()?; Ok(()) } diff --git a/openpgp/examples/notarize.rs b/openpgp/examples/notarize.rs index c93ca744..4ae8b572 100644 --- a/openpgp/examples/notarize.rs +++ b/openpgp/examples/notarize.rs @@ -72,7 +72,7 @@ fn main() -> openpgp::Result<()> { for s in keys { signer = signer.add_signer(s); } - let mut signer = signer.build().context("Failed to create signer")?; + let mut message = signer.build().context("Failed to create signer")?; // Create a parser for the message to be notarized. let mut input = io::stdin(); @@ -89,24 +89,24 @@ fn main() -> openpgp::Result<()> { Packet::PKESK(_) | Packet::SKESK(_) => return Err(anyhow::anyhow!("Encrypted messages are not supported")), Packet::OnePassSig(ref ops) => - ops.serialize(&mut signer).context("Failed to serialize")?, + ops.serialize(&mut message).context("Failed to serialize")?, Packet::Literal(_) => { // Then, create a literal writer to wrap the data in a // literal message packet. let mut literal = - LiteralWriter::new(signer).build() + LiteralWriter::new(message).build() .context("Failed to create literal writer")?; // Copy all the data. io::copy(&mut pp, &mut literal) .context("Failed to sign data")?; - signer = literal.finalize_one() + message = literal.finalize_one() .context("Failed to sign data")? .unwrap(); }, Packet::Signature(ref sig) => - sig.serialize(&mut signer).context("Failed to serialize")?, + sig.serialize(&mut message).context("Failed to serialize")?, _ => (), } @@ -121,7 +121,7 @@ fn main() -> openpgp::Result<()> { } // Finally, teardown the stack to ensure all the data is written. - signer.finalize() + message.finalize() .context("Failed to write data")?; Ok(()) diff --git a/openpgp/examples/pad.rs b/openpgp/examples/pad.rs index 10ee1804..ebd3a50c 100644 --- a/openpgp/examples/pad.rs +++ b/openpgp/examples/pad.rs @@ -58,22 +58,22 @@ fn main() -> openpgp::Result<()> { let message = Armorer::new(message).build()?; // We want to encrypt a literal data packet. - let encryptor = Encryptor::for_recipients(message, recipients) + let message = Encryptor::for_recipients(message, recipients) .build().context("Failed to create encryptor")?; - let padder = Padder::new(encryptor, padme) + let message = Padder::new(message, padme) .context("Failed to create padder")?; - let mut literal_writer = LiteralWriter::new(padder).build() + let mut message = LiteralWriter::new(message).build() .context("Failed to create literal writer")?; // Copy stdin to our writer stack to encrypt the data. - io::copy(&mut io::stdin(), &mut literal_writer) + io::copy(&mut io::stdin(), &mut message) .context("Failed to encrypt")?; // Finally, finalize the OpenPGP message by tearing down the // writer stack. - literal_writer.finalize()?; + message.finalize()?; Ok(()) } diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs index 944abf76..84299109 100644 --- a/openpgp/examples/sign-detached.rs +++ b/openpgp/examples/sign-detached.rs @@ -69,15 +69,15 @@ fn main() -> openpgp::Result<()> { for s in keys { signer = signer.add_signer(s); } - let mut signer = + let mut message = signer.detached().build().context("Failed to create signer")?; // Copy all the data. - io::copy(&mut io::stdin(), &mut signer) + io::copy(&mut io::stdin(), &mut message) .context("Failed to sign data")?; // Finally, teardown the stack to ensure all the data is written. - signer.finalize() + message.finalize() .context("Failed to write data")?; Ok(()) diff --git a/openpgp/examples/sign.rs b/openpgp/examples/sign.rs index b49816cd..483beecd 100644 --- a/openpgp/examples/sign.rs +++ b/openpgp/examples/sign.rs @@ -67,19 +67,19 @@ fn main() -> openpgp::Result<()> { for s in keys { signer = signer.add_signer(s); } - let signer = signer.build().context("Failed to create signer")?; + let message = signer.build().context("Failed to create signer")?; // Then, create a literal writer to wrap the data in a literal // message packet. - let mut literal = LiteralWriter::new(signer).build() + let mut message = LiteralWriter::new(message).build() .context("Failed to create literal writer")?; // Copy all the data. - io::copy(&mut io::stdin(), &mut literal) + io::copy(&mut io::stdin(), &mut message) .context("Failed to sign data")?; // Finally, teardown the stack to ensure all the data is written. - literal.finalize() + message.finalize() .context("Failed to write data")?; Ok(()) diff --git a/openpgp/examples/wrap-literal.rs b/openpgp/examples/wrap-literal.rs index 155638a8..052db8f3 100644 --- a/openpgp/examples/wrap-literal.rs +++ b/openpgp/examples/wrap-literal.rs @@ -30,15 +30,15 @@ fn main() -> openpgp::Result<()> { // Then, create a literal writer to wrap the data in a literal // message packet. - let mut literal = LiteralWriter::new(message).build() + let mut message = LiteralWriter::new(message).build() .context("Failed to create literal writer")?; // Copy all the data. - io::copy(&mut io::stdin(), &mut literal) + io::copy(&mut io::stdin(), &mut message) .context("Failed to sign data")?; // Finally, teardown the stack to ensure all the data is written. - literal.finalize() + message.finalize() .context("Failed to write data")?; Ok(()) |