sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Fix tiebreak in Yggdrasil demo (uses wrong key)

Browse source
This commit is contained in:
Neil Alexander 2020-06-11 13:08:11 +01:00
parent ce2517b9fb
commit 89d61c4877
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/dendrite-demo-yggdrasil/yggconn/node.go
View file

@ -128,6 +128,10 @@ func (n *Node) DerivedServerName() string {
return hex.EncodeToString(n.SigningPublicKey()) return hex.EncodeToString(n.SigningPublicKey())
} }
func (n *Node) DerivedSessionName() string {
return hex.EncodeToString(n.EncryptionPublicKey())
}
func (n *Node) EncryptionPublicKey() []byte { func (n *Node) EncryptionPublicKey() []byte {
edkey := n.SigningPublicKey() edkey := n.SigningPublicKey()
return convert.Ed25519PublicKeyToCurve25519(edkey) return convert.Ed25519PublicKeyToCurve25519(edkey)

4
cmd/dendrite-demo-yggdrasil/yggconn/session.go
View file

@ -42,7 +42,7 @@ func (n *Node) listenFromYgg() {
var session *yamux.Session var session *yamux.Session
// If the remote address is lower than ours then we'll be the // If the remote address is lower than ours then we'll be the
// server. Otherwse we'll be the client. // server. Otherwse we'll be the client.
if strings.Compare(conn.RemoteAddr().String(), n.DerivedServerName()) < 0 { if strings.Compare(conn.RemoteAddr().String(), n.DerivedSessionName()) < 0 {
session, err = yamux.Server(conn, n.yamuxConfig()) session, err = yamux.Server(conn, n.yamuxConfig())
} else { } else {
session, err = yamux.Client(conn, n.yamuxConfig()) session, err = yamux.Client(conn, n.yamuxConfig())
@ -105,7 +105,7 @@ func (n *Node) DialContext(ctx context.Context, network, address string) (net.Co
} }
// If the remote address is lower than ours then we will be the // If the remote address is lower than ours then we will be the
// server. Otherwise we'll be the client. // server. Otherwise we'll be the client.
if strings.Compare(conn.RemoteAddr().String(), n.DerivedServerName()) < 0 { if strings.Compare(conn.RemoteAddr().String(), n.DerivedSessionName()) < 0 {
session, err = yamux.Server(conn, n.yamuxConfig()) session, err = yamux.Server(conn, n.yamuxConfig())
} else { } else {
session, err = yamux.Client(conn, n.yamuxConfig()) session, err = yamux.Client(conn, n.yamuxConfig())