mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-15 02:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

bug fix at testing response val inconsistency

Browse source
This commit is contained in:
terrill 2018-07-16 18:54:19 +08:00
parent d97c71992c
commit 7770664878
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/encryptoapi/routing/keys.go
View file

@ -161,12 +161,12 @@ func QueryPKeys(
deviceKeysQueryMap = presetDeviceKeysQueryMap(deviceKeysQueryMap, uid, key) deviceKeysQueryMap = presetDeviceKeysQueryMap(deviceKeysQueryMap, uid, key)
// load for accomplishment // load for accomplishment
single := deviceKeysQueryMap[key.DeviceID] single := deviceKeysQueryMap[key.DeviceID]
resKey := fmt.Sprintf("@%s:%s", key.KeyAlgorithm, key.DeviceID) resKey := fmt.Sprintf("%s:%s", key.KeyAlgorithm, key.DeviceID)
resBody := key.Key resBody := key.Key
single.Keys[resKey] = resBody single.Keys[resKey] = resBody
single.DeviceID = key.DeviceID single.DeviceID = key.DeviceID
single.UserID = key.UserID single.UserID = key.UserID
single.Signature[uid][fmt.Sprintf("@%s:%s", "ed25519", key.DeviceID)] = key.Signature single.Signature[uid][fmt.Sprintf("%s:%s", "ed25519", key.DeviceID)] = key.Signature
single.Algorithm, err = takeAL(req.Context(), *encryptionDB, key.UserID, key.DeviceID) single.Algorithm, err = takeAL(req.Context(), *encryptionDB, key.UserID, key.DeviceID)
localpart, _, _ := gomatrixserverlib.SplitID('@', uid) localpart, _, _ := gomatrixserverlib.SplitID('@', uid)
device, _ := deviceDB.GetDeviceByID(req.Context(), localpart, deviceID) device, _ := deviceDB.GetDeviceByID(req.Context(), localpart, deviceID)