Merge pull request #270 from hko-s/message-verify-strict

fix: return an error in Message::verify if we don't know what to verify
rpgp · Jan 24, 2024 · d2baf98 · d2baf98
2 parents a98202f + e29d089
commit d2baf98
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/composed/message/types.rs b/src/composed/message/types.rs
@@ -413,9 +413,10 @@ impl Message {
                 let msg = Message::from_bytes(data.decompress()?)?;
                 msg.verify(key)
             }
-            // Nothing to do for others.
-            // TODO: should this return an error?
-            _ => Ok(()),
+            // We don't know how to verify a signature for other Message types, and shouldn't return Ok
+            _ => Err(Error::Unsupported(format!(
+                "Unexpected message format: {self:?}",
+            ))),
         }
     }