Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Malte L
gajim-plugins
Commits
27ef0015
Commit
27ef0015
authored
Feb 11, 2019
by
Philipp Hörist
Browse files
[omemo] Update manifest.ini
parent
3c78b09f
Changes
2
Hide whitespace changes
Inline
Side-by-side
omemo/file_crypto.py
View file @
27ef0015
...
...
@@ -15,6 +15,7 @@
# along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>.
import
os
import
sys
import
hashlib
import
logging
import
socket
...
...
@@ -38,7 +39,7 @@ from gajim.gtk.dialogs import ErrorDialog, YesNoDialog
from
omemo.gtk.progress
import
ProgressWindow
from
omemo.backend.aes
import
aes_decrypt_file
if
os
.
name
==
'nt'
:
if
sys
.
platform
in
(
'win32'
,
'darwin'
)
:
import
certifi
log
=
logging
.
getLogger
(
'gajim.plugin_system.omemo.filedecryption'
)
...
...
@@ -189,7 +190,7 @@ class Download:
get_request
=
urlopen
(
self
.
file
.
url
,
timeout
=
30
,
context
=
context
)
else
:
cafile
=
None
if
os
.
name
==
'nt'
:
if
sys
.
platform
in
(
'win32'
,
'darwin'
)
:
cafile
=
certifi
.
where
()
context
=
ssl
.
create_default_context
(
cafile
=
cafile
)
get_request
=
urlopen
(
self
.
file
.
url
,
timeout
=
30
,
context
=
context
)
...
...
omemo/manifest.ini
View file @
27ef0015
[info]
name:
OMEMO
short_name:
omemo
version:
2.6.4
0
version:
2.6.4
1
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>
Daniel
Gultsch
<daniel@gultsch.de>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment