DandelionNStuff/dkimpy-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new EMSA-PKCS1-v1_5 function in verify() too.

Browse Source
This commit is contained in:
William Grant
2011-03-09 20:49:45 +11:00
parent c859c87c73
commit 405757ef49
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dkim/__init__.py
+3 -16
View File
@@ -606,23 +606,10 @@ def verify(message, debuglog=None, dnsfunc=dnstxt):
d = h.digest() d = h.digest()
if debuglog is not None: if debuglog is not None:
print >>debuglog, "verify digest:", " ".join("%02x" % ord(x) for x in d) print >>debuglog, "verify digest:", " ".join("%02x" % ord(x) for x in d)
try:
dinfo = asn1_build( sig2 = EMSA_PKCS1_v1_5_encode(d, modlen, hashid)
(SEQUENCE, [ except ParameterError:
(SEQUENCE, [
(OBJECT_IDENTIFIER, hashid),
(NULL, None),
]),
(OCTET_STRING, d),
])
)
if debuglog is not None:
print >>debuglog, "dinfo:", " ".join("%02x" % ord(x) for x in dinfo)
if len(dinfo)+3 > modlen:
if debuglog is not None:
print >>debuglog, "Hash too large for modulus"
return False return False
sig2 = "\x00\x01"+"\xff"*(modlen-len(dinfo)-3)+"\x00"+dinfo
if debuglog is not None: if debuglog is not None:
print >>debuglog, "sig2:", " ".join("%02x" % ord(x) for x in sig2) print >>debuglog, "sig2:", " ".join("%02x" % ord(x) for x in sig2)
print >>debuglog, sig['b'] print >>debuglog, sig['b']