1.1 --- a/GPGUtils.py Mon Apr 06 17:23:49 2015 +0200
1.2 +++ b/GPGUtils.py Mon Apr 06 19:05:50 2015 +0200
1.3 @@ -151,6 +151,12 @@
1.4 fingerprint, identity = self.verifyMessageText(signature.get_payload(decode=True), as_string(content))
1.5 return fingerprint, identity, content
1.6
1.7 + def signMessageText(self, text, keyid):
1.8 +
1.9 + "Return a signature for 'text' using the given 'keyid'."
1.10 +
1.11 + return self.run(["--armor", "-u", keyid, "--detach-sig"], text)
1.12 +
1.13 def signMessage(self, message, keyid):
1.14
1.15 """
1.16 @@ -159,7 +165,8 @@
1.17
1.18 # Sign the container's representation.
1.19
1.20 - signature = self.run(["--armor", "-u", keyid, "--detach-sig"], as_string(message))
1.21 + text = as_string(message)
1.22 + signature = self.signMessageText(text, keyid)
1.23
1.24 # Make the container for the message.
1.25
1.26 @@ -172,11 +179,11 @@
1.27
1.28 return signed_message
1.29
1.30 - def decryptMessageText(self, message):
1.31 + def decryptMessageText(self, text):
1.32
1.33 - "Return a decrypted version of 'message'."
1.34 + "Return a decrypted version of 'text'."
1.35
1.36 - return self.run(["--decrypt"], message)
1.37 + return self.run(["--decrypt"], text)
1.38
1.39 def decryptMessage(self, message):
1.40
1.41 @@ -198,6 +205,12 @@
1.42
1.43 return self.decryptMessageText(content.get_payload(decode=True))
1.44
1.45 + def encryptMessageText(self, text, keyid):
1.46 +
1.47 + "Return an encrypted version of 'text' using the given 'keyid'."
1.48 +
1.49 + return self.run(["--armor", "-r", keyid, "--encrypt", "--trust-model", "always"], text)
1.50 +
1.51 def encryptMessage(self, message, keyid):
1.52
1.53 """
1.54 @@ -205,7 +218,7 @@
1.55 """
1.56
1.57 text = as_string(message)
1.58 - encrypted = self.run(["--armor", "-r", keyid, "--encrypt", "--trust-model", "always"], text)
1.59 + encrypted = self.encryptMessageText(text, keyid)
1.60
1.61 # Make the container for the message.
1.62