rpgp
diff --git a/‎Cargo.toml
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎Cargo.toml
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/base64_decoder.rs
Copy file name to clipboard
+1-13Lines changed: 1 addition & 13 deletions b/‎src/base64_decoder.rs
Copy file name to clipboard
+1-13Lines changed: 1 addition & 13 deletions
diff --git a/‎src/crypto/dsa.rs
Copy file name to clipboard
+2-9Lines changed: 2 additions & 9 deletions b/‎src/crypto/dsa.rs
Copy file name to clipboard
+2-9Lines changed: 2 additions & 9 deletions
diff --git a/‎src/crypto/ecdh.rs
Copy file name to clipboard
+5-16Lines changed: 5 additions & 16 deletions b/‎src/crypto/ecdh.rs
Copy file name to clipboard
+5-16Lines changed: 5 additions & 16 deletions
diff --git a/‎src/crypto/ecdsa.rs
Copy file name to clipboard
+6-23Lines changed: 6 additions & 23 deletions b/‎src/crypto/ecdsa.rs
Copy file name to clipboard
+6-23Lines changed: 6 additions & 23 deletions
diff --git a/‎src/crypto/eddsa.rs
Copy file name to clipboard
+3-12Lines changed: 3 additions & 12 deletions b/‎src/crypto/eddsa.rs
Copy file name to clipboard
+3-12Lines changed: 3 additions & 12 deletions
diff --git a/‎src/packet/compressed_data.rs
Copy file name to clipboard
+2-12Lines changed: 2 additions & 12 deletions b/‎src/packet/compressed_data.rs
Copy file name to clipboard
+2-12Lines changed: 2 additions & 12 deletions
diff --git a/‎src/packet/literal_data.rs
Copy file name to clipboard
+3-14Lines changed: 3 additions & 14 deletions b/‎src/packet/literal_data.rs
Copy file name to clipboard
+3-14Lines changed: 3 additions & 14 deletions
diff --git a/‎src/packet/signature/config.rs
Copy file name to clipboard
+1-17Lines changed: 1 addition & 17 deletions b/‎src/packet/signature/config.rs
Copy file name to clipboard
+1-17Lines changed: 1 addition & 17 deletions
diff --git a/‎src/packet/signature/types.rs
Copy file name to clipboard
+2-20Lines changed: 2 additions & 20 deletions b/‎src/packet/signature/types.rs
Copy file name to clipboard
+2-20Lines changed: 2 additions & 20 deletions
@@ -70,6 +70,7 @@ aes-gcm = "0.10.3"
 eax = "0.5.0"
 ocb3 = "0.1"
 aes-kw = { version = "0.2.1", features = ["std"] }
+derive_more = { version = "1.0.0-beta.6", features = ["debug"] }
 
 [dependencies.buffer-redux]
 version = "1.0.0"
 
@@ -1,6 +1,5 @@
 //! # base64 decoder module
 
-use std::fmt;
 use std::io::{self, BufRead, Read};
 
 use base64::engine::{general_purpose::GeneralPurpose, Engine};
@@ -11,6 +10,7 @@ const BUF_CAPACITY: usize = BUF_SIZE / 4 * 3;
 const ENGINE: GeneralPurpose = base64::engine::general_purpose::STANDARD;
 
 /// Decodes Base64 from the supplied reader.
+#[derive(Debug)]
 pub struct Base64Decoder<R> {
     /// The inner Read instance we are reading bytes from.
     inner: BufReader<R>,
@@ -21,18 +21,6 @@ pub struct Base64Decoder<R> {
     err: Option<io::Error>,
 }
 
-impl<R> fmt::Debug for Base64Decoder<R> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let out_buf = format!("{:?}", &self.out_buffer[..]);
-        f.debug_struct("Base64Decoder")
-            .field("inner", &"BufReader")
-            .field("out", &self.out)
-            .field("out_buffer", &out_buf)
-            .field("err", &self.err)
-            .finish()
-    }
-}
-
 impl<R: Read> Base64Decoder<R> {
     /// Creates a new `Base64Decoder`.
     pub fn new(input: R) -> Self {
 
@@ -1,5 +1,3 @@
-use std::fmt;
-
 use dsa::{Components, Signature, SigningKey, VerifyingKey};
 use num_bigint::BigUint;
 use rand::{CryptoRng, Rng};
@@ -14,17 +12,12 @@ use crate::types::{PlainSecretParams, PublicParams};
 pub use dsa::KeySize;
 
 /// Secret key for DSA.
-#[derive(Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
+#[derive(Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop, derive_more::Debug)]
 pub struct SecretKey {
+    #[debug("..")]
     pub x: BigUint,
 }
 
-impl fmt::Debug for SecretKey {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("DSASecretKey").field("x", &"[..]").finish()
-    }
-}
-
 impl Signer for SecretKey {
     fn sign(
         &self,
 
@@ -1,5 +1,3 @@
-use std::fmt;
-
 use log::debug;
 use rand::{CryptoRng, Rng};
 use x25519_dalek::{PublicKey, StaticSecret};
@@ -21,11 +19,12 @@ const ANON_SENDER: [u8; 20] = [
 ];
 
 /// Secret key for ECDH
-#[derive(Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
+#[derive(Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop, derive_more::Debug)]
 pub enum SecretKey {
     /// ECDH with Curve25519
     Curve25519 {
         /// The secret point.
+        #[debug("..")]
         secret: [u8; ECCCurve::Curve25519.secret_key_length()],
         hash: HashAlgorithm,
         alg_sym: SymmetricKeyAlgorithm,
@@ -34,6 +33,7 @@ pub enum SecretKey {
     /// ECDH with Nist P256
     P256 {
         /// The secret point.
+        #[debug("..")]
         secret: [u8; ECCCurve::P256.secret_key_length()],
         hash: HashAlgorithm,
         alg_sym: SymmetricKeyAlgorithm,
@@ -42,6 +42,7 @@ pub enum SecretKey {
     /// ECDH with Nist P384
     P384 {
         /// The secret point.
+        #[debug("..")]
         secret: [u8; ECCCurve::P384.secret_key_length()],
         hash: HashAlgorithm,
         alg_sym: SymmetricKeyAlgorithm,
@@ -50,25 +51,13 @@ pub enum SecretKey {
     /// ECDH with Nist P521
     P521 {
         /// The secret point.
+        #[debug("..")]
         secret: [u8; ECCCurve::P521.secret_key_length()],
         hash: HashAlgorithm,
         alg_sym: SymmetricKeyAlgorithm,
     },
 }
 
-impl fmt::Debug for SecretKey {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let (curve, alg_sym, hash) = self.key_params();
-
-        f.debug_struct("EcdhSecretKey")
-            .field("secret", &"[..]")
-            .field("hash", &hash)
-            .field("oid", &hex::encode(curve.oid()))
-            .field("alg_sym", &alg_sym)
-            .finish()
-    }
-}
-
 impl KeyParams for SecretKey {
     type KeyParams = (ECCCurve, SymmetricKeyAlgorithm, HashAlgorithm);
 
 
@@ -1,5 +1,3 @@
-use std::fmt;
-
 use ecdsa::SigningKey;
 use elliptic_curve::sec1::ToEncodedPoint;
 use p521::NistP521;
@@ -14,36 +12,21 @@ use crate::errors::Result;
 use crate::types::EcdsaPublicParams;
 use crate::types::{Mpi, PlainSecretParams, PublicParams};
 
-#[derive(Clone, PartialEq, Eq, ZeroizeOnDrop)]
+#[derive(Clone, PartialEq, Eq, ZeroizeOnDrop, derive_more::Debug)]
 pub enum SecretKey {
-    P256(p256::SecretKey),
-    P384(p384::SecretKey),
-    P521(p521::SecretKey),
-    Secp256k1(k256::SecretKey),
+    P256(#[debug("..")] p256::SecretKey),
+    P384(#[debug("..")] p384::SecretKey),
+    P521(#[debug("..")] p521::SecretKey),
+    Secp256k1(#[debug("..")] k256::SecretKey),
     Unsupported {
         /// The secret point.
+        #[debug("..")]
         x: Mpi,
         #[zeroize(skip)]
         curve: ECCCurve,
     },
 }
 
-impl fmt::Debug for SecretKey {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::P256(_) => write!(f, "ECDSASecretKey::P256([..])"),
-            Self::P384(_) => write!(f, "ECDSASecretKey::P384([..])"),
-            Self::P521(_) => write!(f, "ECDSASecretKey::P521([..])"),
-            Self::Secp256k1(_) => write!(f, "ECDSASecretKey::Secp256k1([..])"),
-            Self::Unsupported { curve, .. } => f
-                .debug_struct("ECDSASecretKey::Unsupported")
-                .field("x", &"[..]")
-                .field("curve", &curve)
-                .finish(),
-        }
-    }
-}
-
 impl Signer for SecretKey {
     fn sign(
         &self,
 
@@ -1,5 +1,3 @@
-use std::fmt;
-
 use rand::{CryptoRng, Rng};
 use signature::{Signer as _, Verifier};
 use zeroize::{Zeroize, ZeroizeOnDrop, Zeroizing};
@@ -11,22 +9,15 @@ use crate::errors::Result;
 use crate::types::{Mpi, PlainSecretParams, PublicParams};
 
 /// Secret key for EdDSA with Curve25519, the only combination we currently support.
-#[derive(Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
+#[derive(Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop, derive_more::Debug)]
 pub struct SecretKey {
     /// The secret point.
+    #[debug("..")]
     pub secret: [u8; 32],
+    #[debug("{}", hex::encode(oid))]
     pub oid: Vec<u8>,
 }
 
-impl fmt::Debug for SecretKey {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("EdDSASecretKey")
-            .field("secret", &"[..]")
-            .field("oid", &hex::encode(&self.oid))
-            .finish()
-    }
-}
-
 impl Signer for SecretKey {
     fn sign(
         &self,
 
@@ -1,4 +1,3 @@
-use std::fmt;
 use std::io::{self, Read};
 
 use flate2::read::{DeflateDecoder, ZlibDecoder};
@@ -8,10 +7,11 @@ use crate::packet::PacketTrait;
 use crate::ser::Serialize;
 use crate::types::{CompressionAlgorithm, Tag, Version};
 
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq, derive_more::Debug)]
 pub struct CompressedData {
     packet_version: Version,
     compression_algorithm: CompressionAlgorithm,
+    #[debug("{}", hex::encode(compressed_data))]
     compressed_data: Vec<u8>,
 }
 
@@ -96,13 +96,3 @@ impl PacketTrait for CompressedData {
         Tag::CompressedData
     }
 }
-
-impl fmt::Debug for CompressedData {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("CompressedData")
-            .field("packet_version", &self.packet_version)
-            .field("compression_algorithm", &self.compression_algorithm)
-            .field("compressed_data", &hex::encode(&self.compressed_data))
-            .finish()
-    }
-}
@@ -1,4 +1,4 @@
-use std::{fmt, io};
+use std::io;
 
 use bstr::{BStr, BString};
 use byteorder::{BigEndian, WriteBytesExt};
@@ -19,7 +19,7 @@ use crate::types::{Tag, Version};
 
 /// Literal Data Packet
 /// https://tools.ietf.org/html/rfc4880.html#section-5.9
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq, derive_more::Debug)]
 pub struct LiteralData {
     packet_version: Version,
     mode: DataMode,
@@ -28,6 +28,7 @@ pub struct LiteralData {
     created: DateTime<Utc>,
     /// Raw data, stored normalized to CRLF line endings, to make signing and verification
     /// simpler.
+    #[debug("{}", hex::encode(data))]
     data: Vec<u8>,
 }
 
@@ -138,18 +139,6 @@ impl PacketTrait for LiteralData {
     }
 }
 
-impl fmt::Debug for LiteralData {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("LiteralData")
-            .field("packet_version", &self.packet_version)
-            .field("mode", &self.mode)
-            .field("created", &self.created)
-            .field("file_name", &self.file_name)
-            .field("data", &hex::encode(&self.data))
-            .finish()
-    }
-}
-
 #[test]
 fn test_utf8_literal() {
     #![allow(clippy::unwrap_used)]
 
@@ -1,4 +1,3 @@
-use std::fmt;
 use std::io::Read;
 
 use byteorder::{BigEndian, ByteOrder};
@@ -13,7 +12,7 @@ use crate::packet::{Signature, SignatureType, SignatureVersion, Subpacket, Subpa
 use crate::ser::Serialize;
 use crate::types::{KeyId, PublicKeyTrait, SecretKeyTrait, Tag};
 
-#[derive(Clone, PartialEq, Eq, Builder)]
+#[derive(Clone, PartialEq, Eq, Debug, Builder)]
 #[builder(build_fn(error = "Error"))]
 pub struct SignatureConfig {
     #[builder(default)]
@@ -421,18 +420,3 @@ impl SignatureConfig {
             .collect()
     }
 }
-
-impl fmt::Debug for SignatureConfig {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("SignatureConfig")
-            .field("version", &self.version)
-            .field("typ", &self.typ)
-            .field("pub_alg", &self.pub_alg)
-            .field("hash_alg", &self.hash_alg)
-            .field("created", &self.created)
-            .field("issuer", &self.issuer)
-            .field("unhashed_subpackets", &self.unhashed_subpackets)
-            .field("hashed_subpackets", &self.hashed_subpackets)
-            .finish()
-    }
-}
@@ -1,4 +1,3 @@
-use std::fmt;
 use std::io::Read;
 
 use bitfield::bitfield;
@@ -26,12 +25,12 @@ use smallvec::{smallvec, SmallVec};
 
 /// Signature Packet
 /// https://tools.ietf.org/html/rfc4880.html#section-5.2
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq, derive_more::Debug)]
 pub struct Signature {
     packet_version: Version,
 
     pub config: SignatureConfig,
-
+    #[debug("{}", hex::encode(signed_hash_value))]
     pub signed_hash_value: [u8; 2],
     pub signature: Vec<Mpi>,
 }
@@ -900,23 +899,6 @@ pub enum RevocationCode {
     Other(u8),
 }
 
-impl fmt::Debug for Signature {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Signature")
-            .field("packet_version", &self.packet_version)
-            .field("config", &self.config)
-            .field("signed_hash_value", &hex::encode(self.signed_hash_value))
-            .field(
-                "signature",
-                &format_args!(
-                    "{:?}",
-                    self.signature.iter().map(hex::encode).collect::<Vec<_>>()
-                ),
-            )
-            .finish()
-    }
-}
-
 impl PacketTrait for Signature {
     fn packet_version(&self) -> Version {
         self.packet_version