summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/crypto')
-rw-r--r--synapse/crypto/__init__.py1
-rw-r--r--synapse/crypto/context_factory.py2
-rw-r--r--synapse/crypto/keyclient.py1
-rw-r--r--synapse/crypto/keyring.py4
4 files changed, 3 insertions, 5 deletions
diff --git a/synapse/crypto/__init__.py b/synapse/crypto/__init__.py

index 9bff9ec169..f9811bfa04 100644 --- a/synapse/crypto/__init__.py +++ b/synapse/crypto/__init__.py
@@ -12,4 +12,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - diff --git a/synapse/crypto/context_factory.py b/synapse/crypto/context_factory.py
index f402c795bb..3143322d9c 100644 --- a/synapse/crypto/context_factory.py +++ b/synapse/crypto/context_factory.py
@@ -20,6 +20,7 @@ import logging logger = logging.getLogger(__name__) + class ServerContextFactory(ssl.ContextFactory): """Factory for PyOpenSSL SSL contexts that are used to handle incoming connections and to make connections to remote servers.""" @@ -43,4 +44,3 @@ class ServerContextFactory(ssl.ContextFactory): def getContext(self): return self._context - diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py
index 33fa9ca837..bb1f400b54 100644 --- a/synapse/crypto/keyclient.py +++ b/synapse/crypto/keyclient.py
@@ -100,4 +100,3 @@ class SynapseKeyClientProtocol(HTTPClient): class SynapseKeyClientFactory(Factory): protocol = SynapseKeyClientProtocol - diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py
index 2440d604c3..694aed3a7d 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py
@@ -44,7 +44,7 @@ class Keyring(object): raise SynapseError( 400, "Not signed with a supported algorithm", - Codes.UNAUTHORIZED, + Codes.UNAUTHORIZED, ) try: verify_key = yield self.get_server_verify_key(server_name, key_ids) @@ -100,7 +100,7 @@ class Keyring(object): ) if ("signatures" not in response - or server_name not in response["signatures"]): + or server_name not in response["signatures"]): raise ValueError("Key response not signed by remote server") if "tls_certificate" not in response: