diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-03-28 14:25:31 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-03-28 14:39:32 +0100 |
| commit | 01ce378a08f949c2646cb46b471caee93476ec94 (patch) | |
| tree | 768012c57616958afdf65b7246fe61cbc519430a /tool | |
| parent | f27cebdc0df36f147e177111b51f20175cf460d7 (diff) | |
openpgp: Consistently abbreviate symmetric algorithm.
- See #223.
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/src/commands/dump.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs index d8faaca8..ccf8b620 100644 --- a/tool/src/commands/dump.rs +++ b/tool/src/commands/dump.rs @@ -342,7 +342,7 @@ impl PacketDumper { writeln!(output, "{} Version: {}", i, s.version())?; match s { openpgp::packet::SKESK::V4(ref s) => { - writeln!(output, "{} Cipher: {}", i, + writeln!(output, "{} Symmetric algo: {}", i, s.symmetric_algo())?; write!(output, "{} S2K: ", i)?; self.dump_s2k(output, i, s.s2k())?; @@ -353,7 +353,7 @@ impl PacketDumper { }, openpgp::packet::SKESK::V5(ref s) => { - writeln!(output, "{} Cipher: {}", i, + writeln!(output, "{} Symmetric algo: {}", i, s.symmetric_algo())?; writeln!(output, "{} AEAD: {}", i, s.aead_algo())?; @@ -387,7 +387,7 @@ impl PacketDumper { AED(ref a) => { writeln!(output, "AEAD Encrypted Data Packet")?; writeln!(output, "{} Version: {}", i, a.version())?; - writeln!(output, "{} Cipher: {}", i, a.symmetric_algo())?; + writeln!(output, "{} Symmetric algo: {}", i, a.symmetric_algo())?; writeln!(output, "{} AEAD: {}", i, a.aead())?; writeln!(output, "{} Chunk size: {}", i, a.chunk_size())?; writeln!(output, "{} IV: {}", i, hex::encode(a.iv()))?; @@ -449,7 +449,7 @@ impl PacketDumper { KeyExpirationTime(ref t) => write!(output, "{} Key expiration time: {}", i, t)?, PreferredSymmetricAlgorithms(ref c) => - write!(output, "{} Cipher preferences: {}", i, + write!(output, "{} Symmetric algo preferences: {}", i, c.iter().map(|c| format!("{:?}", c)) .collect::<Vec<String>>().join(", "))?, RevocationKey{class, pk_algo, ref fp} => |