From 66875aed6e1596cec3eac5323eddabc45e3bafb2 Mon Sep 17 00:00:00 2001 From: Adam Gibson Date: Mon, 12 Mar 2018 21:32:31 +0200 Subject: [PATCH] Catch all decryption errors for new libnacl >= 1.5.1 libnacl 1.5.1 introduced CryptError as a new Exception type. --- jmdaemon/jmdaemon/message_channel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jmdaemon/jmdaemon/message_channel.py b/jmdaemon/jmdaemon/message_channel.py index 4c84ae8..ba6c6af 100644 --- a/jmdaemon/jmdaemon/message_channel.py +++ b/jmdaemon/jmdaemon/message_channel.py @@ -902,7 +902,7 @@ class MessageChannel(object): to_decrypt = ''.join(_chunks[1:]) try: decrypted = decode_decrypt(to_decrypt, box) - except (ValueError, TypeError) as e: + except Exception as e: log.debug('Error when decrypting, skipping: ' + repr(e)) return