hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[omemo] Update manifest.ini

Browse Source
This commit is contained in:
Philipp Hörist
2019-02-11 23:57:24 +01:00
parent 3c78b09fb2
commit 27ef00157a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
omemo/file_crypto.py
View File

@@ -15,6 +15,7 @@
# along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. # along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>.
import os import os
import sys
import hashlib import hashlib
import logging import logging
import socket import socket
@@ -38,7 +39,7 @@ from gajim.gtk.dialogs import ErrorDialog, YesNoDialog
from omemo.gtk.progress import ProgressWindow from omemo.gtk.progress import ProgressWindow
from omemo.backend.aes import aes_decrypt_file from omemo.backend.aes import aes_decrypt_file
if os.name == 'nt': if sys.platform in ('win32', 'darwin'):
import certifi import certifi
log = logging.getLogger('gajim.plugin_system.omemo.filedecryption') log = logging.getLogger('gajim.plugin_system.omemo.filedecryption')
@@ -189,7 +190,7 @@ class Download:
get_request = urlopen(self.file.url, timeout=30, context=context) get_request = urlopen(self.file.url, timeout=30, context=context)
else: else:
cafile = None cafile = None
if os.name == 'nt': if sys.platform in ('win32', 'darwin'):
cafile = certifi.where() cafile = certifi.where()
context = ssl.create_default_context(cafile=cafile) context = ssl.create_default_context(cafile=cafile)
get_request = urlopen(self.file.url, timeout=30, context=context) get_request = urlopen(self.file.url, timeout=30, context=context)

2
omemo/manifest.ini
View File

@@ -1,7 +1,7 @@
[info] [info]
name: OMEMO name: OMEMO
short_name: omemo short_name: omemo
version: 2.6.40 version: 2.6.41
description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencies, you can find install instructions for your system in the Github Wiki. description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencies, you can find install instructions for your system in the Github Wiki.
authors: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de> authors: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de>
Daniel Gultsch <daniel@gultsch.de> Daniel Gultsch <daniel@gultsch.de>