matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

encryption: Style changes.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-05-12 10:23:28 +02:00
parent 642e518464
commit 5f3842e4fa
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
matrix/encryption.py
View file

@ -34,7 +34,7 @@ import matrix.globals
try: try:
from olm.account import Account, OlmAccountError from olm.account import Account, OlmAccountError
from olm.session import (Session, InboundSession, OlmSessionError, from olm.session import (Session, InboundSession, OlmSessionError,
OlmMessage, OlmPreKeyMessage) OlmPreKeyMessage)
from olm.group_session import ( from olm.group_session import (
InboundGroupSession, InboundGroupSession,
OutboundGroupSession, OutboundGroupSession,
@ -318,7 +318,7 @@ class Olm():
is_new = False is_new = False
plaintext_dict["room_id"] = room_id plaintext_dict["room_id"] = room_id
if not room_id in self.outbound_group_sessions: if room_id not in self.outbound_group_sessions:
self.create_outbound_group_session(room_id) self.create_outbound_group_session(room_id)
is_new = True is_new = True
@ -391,15 +391,19 @@ class Olm():
W.prnt("", pprint.pformat(device_payload_dict)) W.prnt("", pprint.pformat(device_payload_dict))
olm_message = session.encrypt(Olm._to_json(device_payload_dict)) olm_message = session.encrypt(
Olm._to_json(device_payload_dict)
)
olm_dict = { olm_dict = {
"algorithm": "m.olm.v1.curve25519-aes-sha2", "algorithm": "m.olm.v1.curve25519-aes-sha2",
"sender_key": self.account.identity_keys()["curve25519"], "sender_key": self.account.identity_keys()["curve25519"],
"ciphertext": { "ciphertext": {
key.keys["curve25519"]: { key.keys["curve25519"]: {
"type": (0 if isinstance(olm_message, "type": (0 if isinstance(
OlmPreKeyMessage) else 1), olm_message,
OlmPreKeyMessage
) else 1),
"body": olm_message.ciphertext "body": olm_message.ciphertext
} }
} }
@ -410,7 +414,6 @@ class Olm():
} }
return to_device_dict return to_device_dict
# return {}
@classmethod @classmethod
@encrypt_enabled @encrypt_enabled