summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-08-30 12:00:20 +0100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-08-30 12:00:20 +0100
commit3057095a5dab5a6f1c023f25386a6f1e4346bd9f (patch)
tree7ebfa65aae2d1d397cdcb2ec5e827029f27e0e24 /synapse/util
parentFix buildkite pipeline plugin matrix-org/annotate using the wrong variable co... (diff)
downloadsynapse-3057095a5dab5a6f1c023f25386a6f1e4346bd9f.tar.xz
Revert "Use the v2 lookup API for 3PID invites (#5897)" (#5937)
This reverts commit 71fc04069a5770a204c3514e0237d7374df257a8.

This broke 3PID invites as #5892 was required for it to work correctly.
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/hash.py33
1 files changed, 0 insertions, 33 deletions
diff --git a/synapse/util/hash.py b/synapse/util/hash.py
deleted file mode 100644
index 359168704e..0000000000
--- a/synapse/util/hash.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright 2019 The Matrix.org Foundation C.I.C.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-import hashlib
-
-import unpaddedbase64
-
-
-def sha256_and_url_safe_base64(input_text):
-    """SHA256 hash an input string, encode the digest as url-safe base64, and
-    return
-
-    :param input_text: string to hash
-    :type input_text: str
-
-    :returns a sha256 hashed and url-safe base64 encoded digest
-    :rtype: str
-    """
-    digest = hashlib.sha256(input_text.encode()).digest()
-    return unpaddedbase64.encode_base64(digest, urlsafe=True)