Save signature fields earlier.

This commit is contained in:
Stuart D. Gathman
2012-06-12 23:10:10 -04:00
parent 7e5aef1676
commit e0a2e9588b
+1 -1
View File
@@ -485,6 +485,7 @@ class DKIM(object):
# By default, we validate the first DKIM-Signature line found. # By default, we validate the first DKIM-Signature line found.
try: try:
sig = parse_tag_value(sigheaders[idx][1]) sig = parse_tag_value(sigheaders[idx][1])
self.signature_fields = sig
except InvalidTagValueList as e: except InvalidTagValueList as e:
raise MessageFormatError(e) raise MessageFormatError(e)
@@ -549,7 +550,6 @@ class DKIM(object):
self.signed_headers = hash_headers( self.signed_headers = hash_headers(
h, canon_policy, headers, include_headers, sigheaders[idx], sig) h, canon_policy, headers, include_headers, sigheaders[idx], sig)
try: try:
self.signature_fields = sig
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) return RSASSA_PKCS1_v1_5_verify(h, signature, pk)
except (TypeError,DigestTooLargeError) as e: except (TypeError,DigestTooLargeError) as e: