diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2022-02-28 13:55:46 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2022-02-28 18:52:57 +0100 |
| commit | f1ad2ae53335c50932eaaac9d4ea3ce0ff0abd7b (patch) | |
| tree | e7d93049f9bb56591a445bd9249051bef62a8c25 /openpgp/src/cert.rs | |
| parent | ce07edd6a614c401d8efc49c58dc75227a19b136 (diff) | |
openpgp: Improve tracing.
Diffstat (limited to 'openpgp/src/cert.rs')
| -rw-r--r-- | openpgp/src/cert.rs | 40 |
1 files changed, 34 insertions, 6 deletions
diff --git a/openpgp/src/cert.rs b/openpgp/src/cert.rs index 770f9414..0924d334 100644 --- a/openpgp/src/cert.rs +++ b/openpgp/src/cert.rs @@ -1754,11 +1754,11 @@ impl Cert { t!("check_one!({}, {:?}, {:?}, {}, ...)", $desc, $sigs, $sig, stringify!($verify_method)); - if let Ok(()) - = $sig.$verify_method(self.primary.key(), + match $sig.$verify_method(self.primary.key(), self.primary.key(), $($verify_args),*) { + Ok(()) => { t!("Sig {:02X}{:02X}, {:?} \ was out of place. Belongs to {}.", $sig.digest_prefix()[0], @@ -1767,6 +1767,13 @@ impl Cert { $sigs.push($sig); continue 'outer; + }, + Err(err) => { + t!("Sig {:02X}{:02X}, type = {} \ + doesn't belong to {}: {:?}", + sig.digest_prefix()[0], sig.digest_prefix()[1], + sig.typ(), $desc, err); + }, } } }); @@ -1794,10 +1801,11 @@ impl Cert { $desc, stringify!($sigs), $sig, stringify!($verify_method), stringify!($hash_method)); if let Some(key) = $lookup_fn(&sig) { - if let Ok(()) = sig.$verify_method(&key, - self.primary.key(), - $($verify_args),*) + match sig.$verify_method(&key, + self.primary.key(), + $($verify_args),*) { + Ok(()) => { t!("Sig {:02X}{:02X}, {:?} \ was out of place. Belongs to {}.", $sig.digest_prefix()[0], @@ -1806,7 +1814,14 @@ impl Cert { $sigs.push($sig); continue 'outer; - } + }, + Err(err) => { + t!("Sig {:02X}{:02X}, type = {} \ + doesn't belong to {}: {:?}", + sig.digest_prefix()[0], sig.digest_prefix()[1], + sig.typ(), $desc, err); + }, + } } else { // Use hash prefix as heuristic. let key = self.primary.key(); @@ -1834,7 +1849,20 @@ impl Cert { other components (found before? {:?})...", found_component); found_component = true; + } else { + t!("Sig {:02X}{:02X}, {:?} \ + does not belong to {}: \ + hash prefix mismatch", + $sig.digest_prefix()[0], + $sig.digest_prefix()[1], + $sig.typ(), $desc); } + } else { + t!("Sig {:02X}{:02X}, type = {} \ + doesn't use a supported hash algorithm: \ + {:?} unsupported", + sig.digest_prefix()[0], sig.digest_prefix()[1], + sig.typ(), sig.hash_algo()); } } } |