summaryrefslogtreecommitdiffstats
path: root/tool
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2018-06-06 13:19:50 +0200
committerNeal H. Walfield <neal@pep.foundation>2018-06-13 11:15:23 +0200
commit99d0dbe486e0fdd1e1b9cf266f93a726abcf2444 (patch)
tree659e3fa2c60b7f255ff212b5f0ced01c61720ac5 /tool
parent07080242c572234f06ddd617a2dc328948bd6571 (diff)
openpgp: Rename Message to PacketPile
- RFC 4880 defines an OpenPGP message to be a sequence of packets with a particular structure (Section 11.3; https://tools.ietf.org/html/rfc4880#section-11.3). Since there is no term for an unstructured sequence of packets, we invent one.
Diffstat (limited to 'tool')
-rw-r--r--tool/src/sqv.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/tool/src/sqv.rs b/tool/src/sqv.rs
index 3c1acbd2..234581e2 100644
--- a/tool/src/sqv.rs
+++ b/tool/src/sqv.rs
@@ -13,7 +13,7 @@ use std::process::exit;
use clap::{App, Arg, AppSettings};
-use openpgp::{TPK, Packet, Signature, KeyID, Message};
+use openpgp::{TPK, Packet, Signature, KeyID, PacketPile};
use openpgp::constants::HashAlgorithm;
use openpgp::parse::PacketParser;
@@ -194,7 +194,7 @@ fn real_main() -> Result<(), failure::Error> {
// current one.
if let Some(ref keyid) = want {
// Build the TPK...
- let tpk = TPK::from_message(Message::from_packets(acc))?;
+ let tpk = TPK::from_packet_pile(PacketPile::from_packets(acc))?;
acc = vec![];
// ... and remember it.
@@ -236,7 +236,7 @@ fn real_main() -> Result<(), failure::Error> {
// This was the last TPK. Check if we want it.
if let Some(ref keyid) = want {
// Build the TPK...
- let tpk = TPK::from_message(Message::from_packets(acc))?;
+ let tpk = TPK::from_packet_pile(PacketPile::from_packets(acc))?;
// ... and remember it.
remember_tpk(&mut sigs, keyid, &tpk, trace);
}