From 112b3b9b216e84ffe0cc69821b4cedaea4d61aff Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Tue, 7 Jan 2020 11:29:16 +0100 Subject: Revert "tool: Report whether a regex subpacket has a trailing NUL" - Revert commit bf1a613bd35110c326bf84c5b1cb6bf58d0e4261. - Sequoia rejects signature packets that are malformed (this includes regular expression subpackets without a trailing NUL), and automatically adds a trailing NUL byte on serialization. --- tool/src/commands/dump.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'tool') diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs index 4702c63f..aed7fb15 100644 --- a/tool/src/commands/dump.rs +++ b/tool/src/commands/dump.rs @@ -749,13 +749,8 @@ impl PacketDumper { write!(output, "{} Trust signature: level {} trust {}", i, level, trust)?, RegularExpression(ref r) => - write!(output, "{} Regular expression: {} ({})", i, - String::from_utf8_lossy(r), - if r[r.len() - 1] == 0 { - "Required trailing NUL is present" - } else { - "Required trailing NUL is MISSING" - })?, + write!(output, "{} Regular expression: {}", i, + String::from_utf8_lossy(r))?, Revocable(r) => write!(output, "{} Revocable: {}", i, r)?, KeyExpirationTime(t) => -- cgit v1.2.3