diff options
Diffstat (limited to 'fetchmailconf.py')
| -rwxr-xr-x | fetchmailconf.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fetchmailconf.py b/fetchmailconf.py index c6073660..d528341e 100755 --- a/fetchmailconf.py +++ b/fetchmailconf.py @@ -29,7 +29,7 @@ import subprocess from tkinter import * from tkinter.dialog import * -VERSION = "1.63.1" +VERSION = "1.63.2" MIN_PY = (2, 7, 13) if sys.version_info < MIN_PY: @@ -294,7 +294,8 @@ class User(object): self.sslcert = None # SSL certificate filename self.sslproto = None # Force SSL? self.sslcertck = True # Enable strict SSL cert checking - self.sslcertpath = None # Path to trusted certificates + self.sslcertfile = None # Path to bundled file with trusted certificates + self.sslcertpath = None # Path to hashed directory trusted certificates self.sslcommonname = None # SSL CommonName to expect self.sslfingerprint = None # SSL key fingerprint to check self.properties = None # Extension properties @@ -408,6 +409,8 @@ class User(object): res = res + " sslproto " + repr(self.sslproto) if self.sslcertck is not None and self.sslcertck != UserDefaults.sslcertck: res = res + flag2str(self.sslcertck, 'sslcertck') + if self.sslcertfile and self.sslcertfile != UserDefaults.sslcertfile: + res = res + " sslcertfile " + repr(self.sslcertfile) if self.sslcertpath and self.sslcertpath != UserDefaults.sslcertpath: res = res + " sslcertpath " + repr(self.sslcertpath) if self.sslcommonname and self.sslcommonname != UserDefaults.sslcommonname: @@ -1772,6 +1775,8 @@ class UserEdit(Frame, MyWidget): self.sslcert, '14').pack(side=TOP, fill=X) Checkbutton(sslwin, text="Check server SSL certificate?", variable=self.sslcertck).pack(side=TOP, fill=X) + LabeledEntry(sslwin, 'SSL trusted certificate bundle file:', + self.sslcertfile, '14').pack(side=TOP, fill=X) LabeledEntry(sslwin, 'SSL trusted certificate directory:', self.sslcertpath, '14').pack(side=TOP, fill=X) LabeledEntry(sslwin, 'SSL CommonName:', |