summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-20 15:02:45 +0900
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-11-26 16:34:58 +0000
commit76445a68670b8b1cc9a046d582ddc68982e4c221 (patch)
tree79ca7e397a397d8fbf513491125414e16ec3e549 /plugins
parent1f43535f459ca5445dc0a8bfa05d57ac20481cad (diff)
downloadpoezio-76445a68670b8b1cc9a046d582ddc68982e4c221.tar.gz
poezio-76445a68670b8b1cc9a046d582ddc68982e4c221.tar.bz2
poezio-76445a68670b8b1cc9a046d582ddc68982e4c221.tar.xz
poezio-76445a68670b8b1cc9a046d582ddc68982e4c221.zip
Add support for XEP-0380: Explicit Message Encryption
Both for displaying incoming messages, and sending OTR and legacy OpenPGP.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/gpg/__init__.py1
-rw-r--r--plugins/otr.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/plugins/gpg/__init__.py b/plugins/gpg/__init__.py
index 128cd1d1..daf76e65 100644
--- a/plugins/gpg/__init__.py
+++ b/plugins/gpg/__init__.py
@@ -251,6 +251,7 @@ class Plugin(BasePlugin):
encrypted_element.text = self.remove_gpg_headers(xml.sax.saxutils.escape(str(text)))
message.append(encrypted_element)
message['body'] = 'This message has been encrypted using the GPG key with id: %s' % self.keyid
+ message['eme']['namespace'] = 'jabber:x:encrypted'
message.send()
del message['body']
tab.add_message(body, nickname=self.core.own_nick,
diff --git a/plugins/otr.py b/plugins/otr.py
index cffe1797..580a72c4 100644
--- a/plugins/otr.py
+++ b/plugins/otr.py
@@ -347,6 +347,7 @@ class PoezioContext(Context):
message = self.xmpp.make_message(mto=self.peer,
mbody=msg.decode('ascii'),
mtype='chat')
+ message['eme']['namespace'] = 'urn:xmpp:otr:0'
message.enable('carbon_private')
message.enable('no-copy')
message.enable('no-permanent-store')