openpgp: Make Subpacket own the data.

  - The subpacket areas now have a vector of subpackets.  Change some
    accessors here and there to accommodate this.

  - This requires bit-perfect roundtripping of subpackets so that
    signatures are not invalidated.

  - First step towards fixing #200.

1 files changed, 3 insertions, 3 deletions

diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs
index cd9c2cea..de6ec320 100644
--- a/tool/src/commands/dump.rs
+++ b/tool/src/commands/dump.rs
@@ -437,13 +437,13 @@ impl PacketDumper {
                 writeln!(output, "{}  Hash algo: {}", i, s.hash_algo())?;
                 if s.hashed_area().iter().count() > 0 {
                     writeln!(output, "{}  Hashed area:", i)?;
-                    for (_, _, pkt) in s.hashed_area().iter() {
+                    for pkt in s.hashed_area().iter() {
                         self.dump_subpacket(output, i, pkt, s)?;
                     }
                 }
                 if s.unhashed_area().iter().count() > 0 {
                     writeln!(output, "{}  Unhashed area:", i)?;
-                    for (_, _, pkt) in s.unhashed_area().iter() {
+                    for pkt in s.unhashed_area().iter() {
                         self.dump_subpacket(output, i, pkt, s)?;
                     }
                 }
@@ -710,7 +710,7 @@ impl PacketDumper {
     }
 
     fn dump_subpacket(&self, output: &mut dyn io::Write, i: &str,
-                      s: Subpacket, sig: &Signature)
+                      s: &Subpacket, sig: &Signature)
                       -> Result<()> {
         use self::SubpacketValue::*;