summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2011-03-28 19:55:15 +0200
committerMatěj Cepl <mcepl@cepl.eu>2015-10-13 15:23:20 +0200
commite5beb894caf9ed629fde67ca5bf39e7518f49c28 (patch)
treebe1338fcdc62281a2e5eb4bece0db43b5ac54d48 /contrib
parent0f195b9f973eaa7c89c4d88ae76f084a7d1a8738 (diff)
downloadm2crypto-e5beb894caf9ed629fde67ca5bf39e7518f49c28.tar.gz
Fix S/MIME examples and documentation.
See https://bugzilla.redhat.com/show_bug.cgi?id=618500 for more. Rather large reproducer is also included in the bug report.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/smimeplus.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/smimeplus.py b/contrib/smimeplus.py
index 5a9c22d..d21a298 100644
--- a/contrib/smimeplus.py
+++ b/contrib/smimeplus.py
@@ -64,7 +64,7 @@ class smimeplus(object):
_sender.load_key_bio(self.__pack(self.key), self.__pack(self.cert),
callback=self.__passcallback)
- _signed = _sender.sign(self.__pack(msg))
+ _signed = _sender.sign(self.__pack(msg), M2Crypto.SMIME.PKCS7_DETACHED)
_out = self.__pack(None)
_sender.write(_out, _signed, self.__pack(msg))
@@ -93,7 +93,7 @@ class smimeplus(object):
# Load signed message, verify it, and return result
_p7, _data = M2Crypto.SMIME.smime_load_pkcs7_bio(self.__pack(smsg))
try:
- return _sender.verify(_p7, flags=M2Crypto.SMIME.PKCS7_SIGNED)
+ return _sender.verify(_p7, _data, flags=M2Crypto.SMIME.PKCS7_SIGNED)
except M2Crypto.SMIME.SMIME_Error, _msg:
return None