[omemo] Better handle key exchange messages

2018-12-15 16:15:31 +01:00
parent cfa69e9457
commit baefb7728f
1 changed files with 6 additions and 3 deletions
--- a/omemo/omemo/state.py
+++ b/omemo/omemo/state.py
@@ -211,9 +211,12 @@ class OmemoState:
            log.warning('Duplicate message found ' + str(e.args))
            return

-        result = decrypt(key, iv, payload)
-
-        log.debug("Decrypted Message => " + result)
+        if payload is None:
+            result = None
+            log.debug("Decrypted Key Exchange Message")
+        else:
+            result = decrypt(key, iv, payload)
+            log.debug("Decrypted Message => " + result)
        return result

    def create_msg(self, from_jid, jid, plaintext):