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

Base64 decode better

Browse source
This commit is contained in:
Neil Alexander 2020-04-17 10:27:16 +01:00
parent 13f1e96cd9
commit d1a349ac4a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/keydb/keyring.go
View file

@ -15,6 +15,8 @@
package keydb package keydb
import ( import (
"encoding/base64"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"golang.org/x/crypto/ed25519" "golang.org/x/crypto/ed25519"
) )
@ -26,6 +28,10 @@ import (
func CreateKeyRing(client gomatrixserverlib.Client, func CreateKeyRing(client gomatrixserverlib.Client,
keyDB gomatrixserverlib.KeyDatabase) gomatrixserverlib.KeyRing { keyDB gomatrixserverlib.KeyDatabase) gomatrixserverlib.KeyRing {
var b64e = base64.StdEncoding.WithPadding(base64.NoPadding)
matrixOrgKey1, _ := b64e.DecodeString("Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw")
matrixOrgKey2, _ := b64e.DecodeString("l8Hft5qXKn1vfHrg3p4+W8gELQVo8N13JkluMfmn2sQ")
return gomatrixserverlib.KeyRing{ return gomatrixserverlib.KeyRing{
KeyFetchers: []gomatrixserverlib.KeyFetcher{ KeyFetchers: []gomatrixserverlib.KeyFetcher{
// TODO: Use perspective key fetchers for production. // TODO: Use perspective key fetchers for production.
@ -35,8 +41,8 @@ func CreateKeyRing(client gomatrixserverlib.Client,
&gomatrixserverlib.PerspectiveKeyFetcher{ &gomatrixserverlib.PerspectiveKeyFetcher{
PerspectiveServerName: "matrix.org", PerspectiveServerName: "matrix.org",
PerspectiveServerKeys: map[gomatrixserverlib.KeyID]ed25519.PublicKey{ PerspectiveServerKeys: map[gomatrixserverlib.KeyID]ed25519.PublicKey{
"ed25519:auto": ed25519.PublicKey(gomatrixserverlib.Base64String("Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw")), "ed25519:auto": matrixOrgKey1,
"ed25519:a_RXGa": ed25519.PublicKey(gomatrixserverlib.Base64String("l8Hft5qXKn1vfHrg3p4+W8gELQVo8N13JkluMfmn2sQ")), "ed25519:a_RXGa": matrixOrgKey2,
}, },
Client: client, Client: client,
}, },