summary refs log tree commit diff
path: root/synapse/config/tls.py
diff options
context:
space:
mode:
authorSean Quah <8349537+squahtx@users.noreply.github.com>2021-12-06 11:36:08 +0000
committerGitHub <noreply@github.com>2021-12-06 11:36:08 +0000
commita77c36989785c0d5565ab9a1169f4f88e512ce8a (patch)
treed3f095c83192afb66d4b33113a473e4d2d7ddbf5 /synapse/config/tls.py
parentUpdate backward extremity docs to make it clear that it does not indicate whe... (diff)
downloadsynapse-a77c36989785c0d5565ab9a1169f4f88e512ce8a.tar.xz
Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505)
Diffstat (limited to 'synapse/config/tls.py')
-rw-r--r--synapse/config/tls.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py

index 4ca111618f..3e235b57a7 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py
@@ -16,11 +16,12 @@ import logging import os from typing import List, Optional, Pattern +from matrix_common.regex import glob_to_regex + from OpenSSL import SSL, crypto from twisted.internet._sslverify import Certificate, trustRootFromCertificates from synapse.config._base import Config, ConfigError -from synapse.util import glob_to_regex logger = logging.getLogger(__name__)