sq: Handle session keys with algorithm prefix.

  - `sq packet dump` was unable to parse session keys with an algorithm
    indicator, the format established by GnuPG and SOP.

  - `sq` should parse such session keys, and use them only with the
    specified algorithm.

  - Fixes #749.

2 files changed, 121 insertions, 0 deletions

diff --git a/sq/tests/data/messages/rsa.msg.pgp b/sq/tests/data/messages/rsa.msg.pgp
new file mode 100644
index 00000000..1d820827
--- /dev/null
+++ b/sq/tests/data/messages/rsa.msg.pgp
diff --git a/sq/tests/sq-packet-dump.rs b/sq/tests/sq-packet-dump.rs
new file mode 100644
index 00000000..d431d995
--- /dev/null
+++ b/sq/tests/sq-packet-dump.rs
@@ -0,0 +1,121 @@
+#[cfg(test)]
+mod sq_packet_dump {
+    use assert_cmd::Command;
+    use predicates::prelude::*;
+
+    use openpgp::Result;
+    use sequoia_openpgp as openpgp;
+
+    fn artifact(filename: &str) -> String {
+        format!("tests/data/{}", filename)
+    }
+
+    #[test]
+    fn session_key_without_prefix() -> Result<()> {
+        Command::cargo_bin("sq")
+        .unwrap()
+        .arg("packet")
+        .arg("dump")
+        .args(["--session-key", "1FE820EC21FB5D7E33D83367106D1D3747DCD48E6320C1AEC57EE7D18FC437D4"])
+        .arg(artifact("messages/rsa.msg.pgp"))
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Decryption failed").not());
+        Ok(())
+    }
+
+    #[test]
+    fn session_key_with_prefix() -> Result<()> {
+        Command::cargo_bin("sq")
+        .unwrap()
+        .arg("packet")
+        .arg("dump")
+        .args(["--session-key", "9:1FE820EC21FB5D7E33D83367106D1D3747DCD48E6320C1AEC57EE7D18FC437D4"])
+        .arg(artifact("messages/rsa.msg.pgp"))
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Decryption failed").not());
+        Ok(())
+    }
+
+    #[test]
+    fn session_key_with_bad_prefix() -> Result<()> {
+        Command::cargo_bin("sq")
+        .unwrap()
+        .arg("packet")
+        .arg("dump")
+        .args(["--session-key", "1:1FE820EC21FB5D7E33D83367106D1D3747DCD48E6320C1AEC57EE7D18FC437D4"])
+        .arg(artifact("messages/rsa.msg.pgp"))
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Indicated Symmetric algo: IDEA"))
+        .stdout(predicate::str::contains("Decryption failed"));
+        Ok(())
+    }
+
+    #[test]
+    fn session_key_wrong_length_without_prefix() -> Result<()> {
+        // too short
+        Command::cargo_bin("sq")
+        .unwrap()
+        .arg("packet")
+        .arg("dump")
+        .args(["--session-key", "1FE820EC21FB5D7E33D83367106D1D3747DCD48E6320C1AEC57EE7D18FC437"])
+        .arg(artifact("messages/rsa.msg.pgp"))
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Decryption failed"));
+
+        // too long
+        Command::cargo_bin("sq")
+        .unwrap()
+        .arg("packet")
+        .arg("dump")
+        .args(["--session-key", "1FE820EC21FB5D7E33D83367106D1D3747DCD48E6320C1AEC57EE7D18FC437D4AB"])
+        .arg(artifact("messages/rsa.msg.pgp"))
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Decryption failed"));
+        Ok(())
+    }
+
+    #[test]
+    fn session_key_wrong_length_with_prefix() -> Result<()> {
+        // too short
+        Command::cargo_bin("sq")
+        .unwrap()
+        .arg("packet")
+        .arg("dump")
+        .args(["--session-key", "1:1FE820EC21FB5D7E33D83367106D1D3747DCD48E6320C1AEC57EE7D18FC437"])
+        .arg(artifact("messages/rsa.msg.pgp"))
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Decryption failed"));
+
+        // too long
+        Command::cargo_bin("sq")
+        .unwrap()
+        .arg("packet")
+        .arg("dump")
+        .args(["--session-key", "1:1FE820EC21FB5D7E33D83367106D1D3747DCD48E6320C1AEC57EE7D18FC437D4AB"])
+        .arg(artifact("messages/rsa.msg.pgp"))
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Decryption failed"));
+        Ok(())
+    }
+
+    #[test]
+    fn session_key_wrong_key_with_prefix() -> Result<()> {
+        Command::cargo_bin("sq")
+        .unwrap()
+        .arg("packet")
+        .arg("dump")
+        .args(["--session-key", "9:BB9CCB8EDE22DC222C83BD1C63AEB97335DDC7B696DB171BD16EAA5784CC0478"])
+        .arg(artifact("messages/rsa.msg.pgp"))
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Decryption failed"));
+        Ok(())
+    }
+}