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

Fix config population

Browse source
This commit is contained in:
Neil Alexander 2020-09-25 10:10:13 +01:00
parent cdcb343176
commit 6b7f6c1616
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/config/config.go
View file

@ -232,7 +232,7 @@ func loadConfig(
return nil, err return nil, err
} }
for _, oldPrivateKey := range c.Global.OldVerifyKeys { for i, oldPrivateKey := range c.Global.OldVerifyKeys {
var oldPrivateKeyData []byte var oldPrivateKeyData []byte
oldPrivateKeyPath := absPath(basePath, oldPrivateKey.PrivateKeyPath) oldPrivateKeyPath := absPath(basePath, oldPrivateKey.PrivateKeyPath)
@ -241,7 +241,7 @@ func loadConfig(
return nil, err return nil, err
} }
if oldPrivateKey.KeyID, oldPrivateKey.PrivateKey, err = readKeyPEM(oldPrivateKeyPath, oldPrivateKeyData); err != nil { if c.Global.OldVerifyKeys[i].KeyID, c.Global.OldVerifyKeys[i].PrivateKey, err = readKeyPEM(oldPrivateKeyPath, oldPrivateKeyData); err != nil {
return nil, err return nil, err
} }
} }