From e9328f76c356c69d5626ba0dce93681b680fabc6 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 5 Aug 2021 14:35:02 +0100 Subject: [PATCH] It's the self-signing key, not the master key --- keyserver/internal/cross_signing.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keyserver/internal/cross_signing.go b/keyserver/internal/cross_signing.go index 1617369f0..71993d1fe 100644 --- a/keyserver/internal/cross_signing.go +++ b/keyserver/internal/cross_signing.go @@ -346,21 +346,21 @@ func (a *KeyInternalAPI) processSelfSignatures( for originUserID, forOriginUserID := range sig.Signatures { for originKeyID, originSig := range forOriginUserID { - originMasterKeys, ok := queryRes.MasterKeys[originUserID] + originSelfSigningKeys, ok := queryRes.SelfSigningKeys[originUserID] if !ok { return fmt.Errorf("missing master key for user %q", originUserID) } - var originMasterKeyID gomatrixserverlib.KeyID - var originMasterKey gomatrixserverlib.Base64Bytes - for keyID, key := range originMasterKeys.Keys { - originMasterKeyID, originMasterKey = keyID, key + var originSelfSigningKeyID gomatrixserverlib.KeyID + var originSelfSigningKey gomatrixserverlib.Base64Bytes + for keyID, key := range originSelfSigningKeys.Keys { + originSelfSigningKeyID, originSelfSigningKey = keyID, key break } - originMasterKeyPublic := ed25519.PublicKey(originMasterKey) + originSelfSigningKeyPublic := ed25519.PublicKey(originSelfSigningKey) - if err := gomatrixserverlib.VerifyJSON(originUserID, originMasterKeyID, originMasterKeyPublic, j); err != nil { + if err := gomatrixserverlib.VerifyJSON(originUserID, originSelfSigningKeyID, originSelfSigningKeyPublic, j); err != nil { return fmt.Errorf("gomatrixserverlib.VerifyJSON: %w", err) }