diff options
author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-10-23 17:39:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-23 17:39:31 +0100 |
commit | 0d437698b2e040eface5094852576c43916c2e0c (patch) | |
tree | 9090c6c6f5ba5566786b8654cee07b3c3acd97c8 /synapse/crypto | |
parent | Merge pull request #2566 from matrix-org/rav/media_logcontext_leak (diff) | |
parent | fix vars named `l` (diff) | |
download | synapse-0d437698b2e040eface5094852576c43916c2e0c.tar.xz |
Merge pull request #2568 from matrix-org/rav/pep8
PEP8 fixes
Diffstat (limited to '')
-rw-r--r-- | synapse/crypto/context_factory.py | 2 | ||||
-rw-r--r-- | synapse/crypto/event_signing.py | 2 | ||||
-rw-r--r-- | synapse/crypto/keyring.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py index aad4752fe7..cff3ca809a 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py @@ -34,7 +34,7 @@ class ServerContextFactory(ssl.ContextFactory): try: _ecCurve = _OpenSSLECCurve(_defaultCurveName) _ecCurve.addECKeyToContext(context) - except: + except Exception: logger.exception("Failed to enable elliptic curve for TLS") context.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3) context.use_certificate_chain_file(config.tls_certificate_file) diff --git a/synapse/crypto/event_signing.py b/synapse/crypto/event_signing.py index ec7711ba7d..0d0e7b5286 100644 --- a/synapse/crypto/event_signing.py +++ b/synapse/crypto/event_signing.py @@ -43,7 +43,7 @@ def check_event_content_hash(event, hash_algorithm=hashlib.sha256): message_hash_base64 = event.hashes[name] try: message_hash_bytes = decode_base64(message_hash_base64) - except: + except Exception: raise SynapseError( 400, "Invalid base64: %s" % (message_hash_base64,), diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 054bac456d..35f810b07b 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -759,7 +759,7 @@ def _handle_key_deferred(verify_request): )) try: verify_signed_json(json_object, server_name, verify_key) - except: + except Exception: raise SynapseError( 401, "Invalid signature for server %s with key %s:%s" % ( |