diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-10 18:33:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-10 18:33:55 +0100 |
| commit | abce00fc6a722884d68aa56081b0e86a3c667b00 (patch) | |
| tree | 8a116e98cc94acb1e0393f0ecd8d63ca2c6893f7 /synapse/crypto/keyring.py | |
| parent | Merge pull request #5415 from matrix-org/erikj/fix_null_valid_until_ms (diff) | |
| parent | 1.0.0rc2 (diff) | |
| download | synapse-abce00fc6a722884d68aa56081b0e86a3c667b00.tar.xz | |
Merge branch 'release-v1.0.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 96964b0d50..6f603f1961 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -750,13 +750,6 @@ class PerspectivesKeyFetcher(BaseV2KeyFetcher): verify_signed_json(response, perspective_name, perspective_keys[key_id]) verified = True - if perspective_name == "matrix.org" and key_id == "ed25519:auto": - logger.warning( - "Trusting trusted_key_server responses signed by the " - "compromised matrix.org signing key 'ed25519:auto'. " - "This is a placebo." - ) - if not verified: raise KeyLookupError( "Response not signed with a known key: signed with: %r, known keys: %r" |