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

Use Base64Bytes

Browse source
This commit is contained in:
Neil Alexander 2022-10-06 11:15:20 +01:00
parent 342bcbe021
commit 4ed090d9b9
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
federationapi/routing/keys.go
View file

@ -160,7 +160,7 @@ func localKeys(cfg *config.FederationAPI, validUntil time.Time) (*gomatrixserver
for _, oldVerifyKey := range cfg.Matrix.OldVerifyKeys { for _, oldVerifyKey := range cfg.Matrix.OldVerifyKeys {
keys.OldVerifyKeys[oldVerifyKey.KeyID] = gomatrixserverlib.OldVerifyKey{ keys.OldVerifyKeys[oldVerifyKey.KeyID] = gomatrixserverlib.OldVerifyKey{
VerifyKey: gomatrixserverlib.VerifyKey{ VerifyKey: gomatrixserverlib.VerifyKey{
Key: gomatrixserverlib.Base64Bytes(oldVerifyKey.PublicKey), Key: oldVerifyKey.PublicKey,
}, },
ExpiredTS: oldVerifyKey.ExpiredAt, ExpiredTS: oldVerifyKey.ExpiredAt,
} }

2
setup/config/config.go
View file

@ -263,7 +263,7 @@ func loadConfig(
key.KeyID = keyID key.KeyID = keyID
key.PrivateKey = privateKey key.PrivateKey = privateKey
key.PublicKey = privateKey.Public().(ed25519.PublicKey) key.PublicKey = privateKey.Public().(gomatrixserverlib.Base64Bytes)
} }
} }

2
setup/config/config_global.go
View file

@ -128,7 +128,7 @@ type OldVerifyKeys struct {
PrivateKey ed25519.PrivateKey `yaml:"-"` PrivateKey ed25519.PrivateKey `yaml:"-"`
// The public key, in case only that part is known. // The public key, in case only that part is known.
PublicKey ed25519.PublicKey `yaml:"public_key"` PublicKey gomatrixserverlib.Base64Bytes `yaml:"public_key"`
// The key ID of the private key. // The key ID of the private key.
KeyID gomatrixserverlib.KeyID `yaml:"-"` KeyID gomatrixserverlib.KeyID `yaml:"-"`