Commit cc04e3ac authored by Philipp Hörist's avatar Philipp Hörist

[omemo] Port omemoplugin changes from master

parent a58ff4f6
This diff is collapsed.
This diff is collapsed.
...@@ -79,10 +79,14 @@ class OmemoMessage(Node): ...@@ -79,10 +79,14 @@ class OmemoMessage(Node):
# , contact_jid, key, iv, payload, dev_id, my_dev_id): # , contact_jid, key, iv, payload, dev_id, my_dev_id):
Node.__init__(self, 'encrypted', attrs={'xmlns': NS_OMEMO}) Node.__init__(self, 'encrypted', attrs={'xmlns': NS_OMEMO})
header = Node('header', attrs={'sid': msg_dict['sid']}) header = Node('header', attrs={'sid': msg_dict['sid']})
for rid, key in msg_dict['keys'].items(): for rid, (key, prekey) in msg_dict['keys'].items():
header.addChild('key', attrs={'rid': rid}).addData(b64encode(key) if prekey:
.decode('utf-8')) child = header.addChild('key',
attrs={'prekey': 'true', 'rid': rid})
child = header.addChild('key',
attrs={'rid': rid})
header.addChild('iv').addData(b64encode(msg_dict['iv']).decode('utf-8')) header.addChild('iv').addData(b64encode(msg_dict['iv']).decode('utf-8'))
self.addChild(node=header) self.addChild(node=header)
self.addChild('payload').addData(b64encode(msg_dict['payload']) self.addChild('payload').addData(b64encode(msg_dict['payload'])
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment