hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-28 16:08:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix error when keyblock is nil (#394)

Browse source
This commit is contained in:
Vincent Glize 2018-03-03 13:18:28 +01:00 committed by Erik Johnston
parent 139cb7a01e
commit 6b55972183
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/github.com/matrix-org/dendrite/common/config/config.go
View file

@ -525,6 +525,9 @@ func readKeyPEM(path string, data []byte) (gomatrixserverlib.KeyID, ed25519.Priv
if data == nil { if data == nil {
return "", nil, fmt.Errorf("no matrix private key PEM data in %q", path) return "", nil, fmt.Errorf("no matrix private key PEM data in %q", path)
} }
if keyBlock == nil {
return "", nil, fmt.Errorf("keyBlock is nil %q", path)
}
if keyBlock.Type == "MATRIX PRIVATE KEY" { if keyBlock.Type == "MATRIX PRIVATE KEY" {
keyID := keyBlock.Headers["Key-ID"] keyID := keyBlock.Headers["Key-ID"]
if keyID == "" { if keyID == "" {