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

s/Base64String/Base64Bytes/g

Browse source 
Requires https://github.com/matrix-org/gomatrixserverlib/pull/203 to land first
This commit is contained in:
Kegan Dougal 2020-06-04 11:05:00 +01:00
parent 225b72bd42
commit 8214df90a8
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go
View file

@ -18,4 +18,4 @@ package sqlite3
func isConstraintError(err error) bool {
return false
}
}

2
clientapi/threepid/invites.go
View file

@ -279,7 +279,7 @@ func queryIDServerPubKey(ctx context.Context, idServerName string, keyID string)
}
var pubKeyRes struct {
PublicKey gomatrixserverlib.Base64String `json:"public_key"`
PublicKey gomatrixserverlib.Base64Bytes `json:"public_key"`
}
if resp.StatusCode != http.StatusOK {

2
cmd/dendrite-demo-libp2p/mdnslistener.go
View file

@ -43,7 +43,7 @@ func (n *mDNSListener) HandlePeerFound(p peer.AddrInfo) {
KeyID: "ed25519:p2pdemo",
}: {
VerifyKey: gomatrixserverlib.VerifyKey{
Key: gomatrixserverlib.Base64String(raw),
Key: gomatrixserverlib.Base64Bytes(raw),
},
ValidUntilTS: math.MaxUint64 >> 1,
ExpiredTS: gomatrixserverlib.PublicKeyNotExpired,

2
cmd/dendritejs/keyfetcher.go
View file

@ -62,7 +62,7 @@ func (f *libp2pKeyFetcher) FetchKeys(
if err != nil {
return nil, fmt.Errorf("Failed to extract raw bytes from public key: %w", err)
}
b64Key := gomatrixserverlib.Base64String(pubKeyBytes)
b64Key := gomatrixserverlib.Base64Bytes(pubKeyBytes)
res[req] = gomatrixserverlib.PublicKeyLookupResult{
VerifyKey: gomatrixserverlib.VerifyKey{
Key: b64Key,

2
federationapi/routing/keys.go
View file

@ -44,7 +44,7 @@ func localKeys(cfg *config.Dendrite, validUntil time.Time) (*gomatrixserverlib.S
keys.VerifyKeys = map[gomatrixserverlib.KeyID]gomatrixserverlib.VerifyKey{
cfg.Matrix.KeyID: {
Key: gomatrixserverlib.Base64String(publicKey),
Key: gomatrixserverlib.Base64Bytes(publicKey),
},
}

2
serverkeyapi/storage/postgres/keydb.go
View file

@ -60,7 +60,7 @@ func NewDatabase(
}
value := gomatrixserverlib.PublicKeyLookupResult{
VerifyKey: gomatrixserverlib.VerifyKey{
Key: gomatrixserverlib.Base64String(serverKey),
Key: gomatrixserverlib.Base64Bytes(serverKey),
},
ValidUntilTS: gomatrixserverlib.AsTimestamp(time.Now().Add(100 * 365 * 24 * time.Hour)),
ExpiredTS: gomatrixserverlib.PublicKeyNotExpired,

2
serverkeyapi/storage/sqlite3/keydb.go
View file

@ -75,7 +75,7 @@ func NewDatabase(
}
value := gomatrixserverlib.PublicKeyLookupResult{
VerifyKey: gomatrixserverlib.VerifyKey{
Key: gomatrixserverlib.Base64String(serverKey),
Key: gomatrixserverlib.Base64Bytes(serverKey),
},
ValidUntilTS: gomatrixserverlib.AsTimestamp(time.Now().Add(100 * 365 * 24 * time.Hour)),
ExpiredTS: gomatrixserverlib.PublicKeyNotExpired,