1.1 --- a/MoinMessage.py Sat Oct 20 18:21:20 2012 +0200
1.2 +++ b/MoinMessage.py Sat Oct 20 19:27:25 2012 +0200
1.3 @@ -86,7 +86,7 @@
1.4 if not cmd.wait():
1.5 return text
1.6 else:
1.7 - raise MoinMessageError, errors
1.8 + raise MoinMessageError, self.errors
1.9
1.10 finally:
1.11 cmd.stdout.close()
1.12 @@ -113,7 +113,22 @@
1.13
1.14 # Verify the message text.
1.15
1.16 - self.run(["--verify", signature_filename, content_filename])
1.17 + text = self.run(["--status-fd", "1", "--verify", signature_filename, content_filename])
1.18 +
1.19 + # Return the details of the signing key.
1.20 +
1.21 + for line in text.split("\n"):
1.22 + try:
1.23 + prefix, msgtype, fingerprint, details = line.strip().split(" ", 3)
1.24 + except ValueError:
1.25 + continue
1.26 +
1.27 + # Return the fingerprint and identity details.
1.28 +
1.29 + if msgtype == "GOODSIG":
1.30 + return fingerprint, details
1.31 +
1.32 + return None
1.33
1.34 finally:
1.35 os.remove(signature_filename)
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/tests/test_decrypt.py Sat Oct 20 19:27:25 2012 +0200
2.3 @@ -0,0 +1,18 @@
2.4 +#!/usr/bin/env python
2.5 +
2.6 +from MoinMessage import GPG
2.7 +from email.parser import Parser
2.8 +import sys
2.9 +
2.10 +if __name__ == "__main__":
2.11 + message = Parser().parse(sys.stdin)
2.12 + declaration, content = message.get_payload()
2.13 +
2.14 + gpg = GPG()
2.15 + text = gpg.decryptMessage(content.get_payload())
2.16 +
2.17 + # Show the resulting message text.
2.18 +
2.19 + print text
2.20 +
2.21 +# vim: tabstop=4 expandtab shiftwidth=4
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/tests/test_verify.py Sat Oct 20 19:27:25 2012 +0200
3.3 @@ -0,0 +1,14 @@
3.4 +#!/usr/bin/env python
3.5 +
3.6 +from MoinMessage import GPG
3.7 +from email.parser import Parser
3.8 +import sys
3.9 +
3.10 +if __name__ == "__main__":
3.11 + message = Parser().parse(sys.stdin)
3.12 + content, signature = message.get_payload()
3.13 +
3.14 + gpg = GPG()
3.15 + print gpg.verifyMessage(signature.get_payload(), content.as_string())
3.16 +
3.17 +# vim: tabstop=4 expandtab shiftwidth=4