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

Report public key too small only when message otherwise passes.

Browse Source
This commit is contained in:
Stuart D. Gathman
2012-10-27 11:23:05 -04:00
parent 5f2024fdf8
commit d7d0979a7e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dkim/__init__.py
+4 -3
View File
@@ -545,8 +545,6 @@ class DKIM(object):
try: try:
pk = parse_public_key(base64.b64decode(pub[b'p'])) pk = parse_public_key(base64.b64decode(pub[b'p']))
self.keysize = bitsize(pk['modulus']) self.keysize = bitsize(pk['modulus'])
if self.keysize < self.minkey:
raise KeyFormatError("public key too small: %d" % self.keysize)
except KeyError: except KeyError:
raise KeyFormatError("incomplete public key: %s" % s) raise KeyFormatError("incomplete public key: %s" % s)
except (TypeError,UnparsableKeyError) as e: except (TypeError,UnparsableKeyError) as e:
@@ -564,7 +562,10 @@ class DKIM(object):
h, canon_policy, headers, include_headers, sigheaders[idx], sig) h, canon_policy, headers, include_headers, sigheaders[idx], sig)
try: try:
signature = base64.b64decode(re.sub(br"\s+", b"", sig[b'b'])) signature = base64.b64decode(re.sub(br"\s+", b"", sig[b'b']))
return RSASSA_PKCS1_v1_5_verify(h, signature, pk) res = RSASSA_PKCS1_v1_5_verify(h, signature, pk)
if res and self.keysize < self.minkey:
raise KeyFormatError("public key too small: %d" % self.keysize)
return res
except (TypeError,DigestTooLargeError) as e: except (TypeError,DigestTooLargeError) as e:
raise KeyFormatError("digest too large for modulus: %s"%e) raise KeyFormatError("digest too large for modulus: %s"%e)
packaging/pydkim.spec
+2 -1
View File
@@ -45,7 +45,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sat Apr 21 2012 Stuart Gathman <stuart@bmsi.com> 0.5.3-1 * Sat Apr 21 2012 Stuart Gathman <stuart@bmsi.com> 0.5.3-1
- Raise KeyFormatError when public key less than 1024 bits - Raise KeyFormatError when public key less than 1024 bits by default
- Fix TAB in FWS bug
* Sat Apr 21 2012 Stuart Gathman <stuart@bmsi.com> 0.5.2-1 * Sat Apr 21 2012 Stuart Gathman <stuart@bmsi.com> 0.5.2-1
- Fix sha1 hash, Bug #969206 - Fix sha1 hash, Bug #969206