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

- Make RSA signatures in dkimpy-milter optional, so dkimpy-milter can be

Browse Source 
added after an existing DKIM signing application to add an Ed25519
   signature (Thanks to A. Schulze for the patch)
This commit is contained in:
A. Schulze
2018-03-04 13:33:32 -05:00
committed by Scott Kitterman
parent 7683fa7187
commit 3e57876361
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+3
View File
@@ -7,6 +7,9 @@
creation to README creation to README
- Fixed a bug where dkim fail might be reported as pass when verifying - Fixed a bug where dkim fail might be reported as pass when verifying
multiple signatures and a previous signature had passed multiple signatures and a previous signature had passed
- Make RSA signatures in dkimpy-milter optional, so dkimpy-milter can be
added after an existing DKIM signing application to add an Ed25519
signature (Thanks to A. Schulze for the patch)
0.9.3 2018-03-02 0.9.3 2018-03-02
- Fixup csl dataset processing for single item lists - Fixup csl dataset processing for single item lists
dkimpy_milter/__init__.py
+6 -5
View File
@@ -195,11 +195,12 @@ class dkimMilter(Milter.Base):
canonicalize.append(canon) canonicalize.append(canon)
syslog.syslog('canonicalize: {0}'.format(canonicalize)) syslog.syslog('canonicalize: {0}'.format(canonicalize))
try: try:
d = dkim.DKIM(txt) if privateRSA:
h = d.sign(milterconfig.get('Selector'), self.fdomain, privateRSA, d = dkim.DKIM(txt)
canonicalize=(canonicalize[0], canonicalize[1])) h = d.sign(milterconfig.get('Selector'), self.fdomain, privateRSA,
name,val = h.split(': ',1) canonicalize=(canonicalize[0], canonicalize[1]))
self.addheader(name,val.strip().replace('\r\n','\n'),0) name,val = h.split(': ',1)
self.addheader(name,val.strip().replace('\r\n','\n'),0)
if privateEd25519: if privateEd25519:
d = dkim.DKIM(txt) d = dkim.DKIM(txt)
h = d.sign(milterconfig.get('SelectorEd25519'), self.fdomain, privateEd25519, h = d.sign(milterconfig.get('SelectorEd25519'), self.fdomain, privateEd25519,