mirror of
https://github.com/matrix-org/dendrite
synced 2024-11-18 07:40:53 +01:00
Tweak /key/v2/server
This commit is contained in:
parent
9b8bb55430
commit
deddf686b9
1 changed files with 8 additions and 7 deletions
|
@ -146,10 +146,10 @@ func localKeys(cfg *config.FederationAPI, serverName gomatrixserverlib.ServerNam
|
|||
var keys gomatrixserverlib.ServerKeys
|
||||
var virtualHost *config.VirtualHost
|
||||
for _, v := range cfg.Matrix.VirtualHosts {
|
||||
if v.ServerName != serverName {
|
||||
continue
|
||||
if v.ServerName == serverName {
|
||||
virtualHost = v
|
||||
break
|
||||
}
|
||||
virtualHost = v
|
||||
}
|
||||
|
||||
if virtualHost == nil {
|
||||
|
@ -188,14 +188,15 @@ func localKeys(cfg *config.FederationAPI, serverName gomatrixserverlib.ServerNam
|
|||
return nil, err
|
||||
}
|
||||
|
||||
keys.Raw, err = gomatrixserverlib.SignJSON(
|
||||
string(serverName), cfg.Matrix.KeyID, cfg.Matrix.PrivateKey, toSign,
|
||||
)
|
||||
identity, err := cfg.Matrix.SigningIdentityFor(serverName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &keys, nil
|
||||
keys.Raw, err = gomatrixserverlib.SignJSON(
|
||||
string(identity.ServerName), identity.KeyID, identity.PrivateKey, toSign,
|
||||
)
|
||||
return &keys, err
|
||||
}
|
||||
|
||||
func NotaryKeys(
|
||||
|
|
Loading…
Reference in a new issue