mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 01:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

It's the self-signing key, not the master key

Browse source
This commit is contained in:
Neil Alexander 2021-08-05 14:35:02 +01:00
parent 58ba7dcc46
commit e9328f76c3
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
keyserver/internal/cross_signing.go
View file

@ -346,21 +346,21 @@ func (a *KeyInternalAPI) processSelfSignatures(
for originUserID, forOriginUserID := range sig.Signatures { for originUserID, forOriginUserID := range sig.Signatures {
for originKeyID, originSig := range forOriginUserID { for originKeyID, originSig := range forOriginUserID {
originMasterKeys, ok := queryRes.MasterKeys[originUserID] originSelfSigningKeys, ok := queryRes.SelfSigningKeys[originUserID]
if !ok { if !ok {
return fmt.Errorf("missing master key for user %q", originUserID) return fmt.Errorf("missing master key for user %q", originUserID)
} }
var originMasterKeyID gomatrixserverlib.KeyID var originSelfSigningKeyID gomatrixserverlib.KeyID
var originMasterKey gomatrixserverlib.Base64Bytes var originSelfSigningKey gomatrixserverlib.Base64Bytes
for keyID, key := range originMasterKeys.Keys { for keyID, key := range originSelfSigningKeys.Keys {
originMasterKeyID, originMasterKey = keyID, key originSelfSigningKeyID, originSelfSigningKey = keyID, key
break 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) return fmt.Errorf("gomatrixserverlib.VerifyJSON: %w", err)
} }