From 6557eba7dc63e50e81c07805770a09ac856233b0 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Tue, 23 Mar 2021 10:24:03 +0000
Subject: [PATCH] Revert "Patch to temporarily drop cross-user
 m.key_share_requests (#8675)"

This reverts commit d60af9305a07fadcf0270d1887c5b7d063834967.
---
 changelog.d/8675.misc                   | 1 -
 synapse/federation/federation_server.py | 4 ----
 2 files changed, 5 deletions(-)
 delete mode 100644 changelog.d/8675.misc

diff --git a/changelog.d/8675.misc b/changelog.d/8675.misc
deleted file mode 100644
index 7ffe38b7d9..0000000000
--- a/changelog.d/8675.misc
+++ /dev/null
@@ -1 +0,0 @@
-Temporarily drop cross-user m.room_key_request to_device messages over performance concerns.
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 98caf2a1a4..9839d3d016 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -955,10 +955,6 @@ class FederationHandlerRegistry:
         ):
             return
 
-        # Temporary patch to drop cross-user key share requests
-        if edu_type == "m.room_key_request":
-            return
-
         # Check if we have a handler on this instance
         handler = self.edu_handlers.get(edu_type)
         if handler: