From 8574c1aacecae186e6f035be43b337f8cfc28da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Tue, 27 Sep 2016 00:34:03 +0200 Subject: [PATCH] Use cert validation only on Windows for now --- plugin_installer/plugin_installer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugin_installer/plugin_installer.py b/plugin_installer/plugin_installer.py index ea9abc2..2154b45 100644 --- a/plugin_installer/plugin_installer.py +++ b/plugin_installer/plugin_installer.py @@ -114,15 +114,14 @@ class PluginInstaller(GajimPlugin): '\n%s') % plugins_str, on_response_yes=open_update) def ftp_connect(self): - if sys.version_info >= (3, 4): + if os.name == 'nt': ctx = ssl.create_default_context() con = ftplib.FTP_TLS(self.config['ftp_server'], context=ctx) - log.debug('Plugin Server Cert verified') else: con = ftplib.FTP_TLS(self.config['ftp_server']) + con.login() con.prot_p() - return con @log_calls('PluginInstallerPlugin')