From 9c7305f3d2199ad8a2b769b660e65c0969bf4398 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Thu, 5 Aug 2021 16:53:03 +0100
Subject: [PATCH] maps are tedious

---
 keyserver/internal/cross_signing.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/keyserver/internal/cross_signing.go b/keyserver/internal/cross_signing.go
index b2703a49b..8b39177a8 100644
--- a/keyserver/internal/cross_signing.go
+++ b/keyserver/internal/cross_signing.go
@@ -472,8 +472,14 @@ func (a *KeyInternalAPI) QuerySignatures(ctx context.Context, req *api.QuerySign
 			for targetPurpose, targetKey := range keyMap {
 				switch targetPurpose {
 				case gomatrixserverlib.CrossSigningKeyPurposeMaster:
+					if res.MasterKeys == nil {
+						res.MasterKeys = map[string]gomatrixserverlib.CrossSigningKey{}
+					}
 					res.MasterKeys[targetUserID] = targetKey
 				case gomatrixserverlib.CrossSigningKeyPurposeSelfSigning:
+					if res.SelfSigningKeys == nil {
+						res.SelfSigningKeys = map[string]gomatrixserverlib.CrossSigningKey{}
+					}
 					res.SelfSigningKeys[targetUserID] = targetKey
 				}
 			}