openpgp: Improve debug formatting of the bitfield types.

  - Do not erroneously report padding for KeyFlags.

  - Print unknown flags and padding for KeyServerPreferences.

  - Provide nicer output for Features.

1 files changed, 18 insertions, 0 deletions

diff --git a/openpgp/src/types/server_preferences.rs b/openpgp/src/types/server_preferences.rs
index 549ae07e..42c0a74d 100644
--- a/openpgp/src/types/server_preferences.rs
+++ b/openpgp/src/types/server_preferences.rs
@@ -18,8 +18,23 @@ impl Default for KeyServerPreferences {
 
 impl fmt::Debug for KeyServerPreferences {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let mut dirty = false;
         if self.no_modify() {
             f.write_str("no modify")?;
+            dirty = true;
+        }
+        if ! self.unknown.is_empty() {
+            if dirty { f.write_str(", ")?; }
+            f.write_str("+0x")?;
+            f.write_str(
+                &crate::fmt::hex::encode_pretty(&self.unknown))?;
+            dirty = true;
+        }
+        if self.pad_to >
+            KEYSERVER_PREFERENCES_N_KNOWN_BYTES + self.unknown.len()
+        {
+            if dirty { f.write_str(", ")?; }
+            write!(f, "+padding({} bytes)", self.pad_to - self.unknown.len())?;
         }
 
         Ok(())
@@ -105,6 +120,9 @@ impl KeyServerPreferences {
 /// than one person.
 const KEYSERVER_PREFERENCE_NO_MODIFY: u8 = 0x80;
 
+/// Number of bytes with known flags.
+const KEYSERVER_PREFERENCES_N_KNOWN_BYTES: usize = 1;
+
 #[cfg(test)]
 mod tests {
     use super::*;