From c6d1c62b65d5d0a9f57a593b94d4408ac93fbc19 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 12 Sep 2020 02:47:10 +0300 Subject: [PATCH] Make generating cross-signing keys work --- go.mod | 2 +- go.sum | 2 ++ matrix/uia-fallback.go | 1 + ui/crypto-commands.go | 14 ++++++++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 8ff46aa..e6933d4 100644 --- a/go.mod +++ b/go.mod @@ -29,4 +29,4 @@ require ( ) //replace maunium.net/go/mautrix => ../mautrix-go -replace maunium.net/go/mautrix => github.com/nikofil/mautrix-go v0.5.2-0.20200911232449-6010305aed05 +replace maunium.net/go/mautrix => github.com/nikofil/mautrix-go v0.5.2-0.20200911234625-a585557b3750 diff --git a/go.sum b/go.sum index 50f21d3..7bdf4b8 100644 --- a/go.sum +++ b/go.sum @@ -54,6 +54,8 @@ github.com/nikofil/mautrix-go v0.5.2-0.20200911223256-b40ab761fadc h1:Un166sriST github.com/nikofil/mautrix-go v0.5.2-0.20200911223256-b40ab761fadc/go.mod h1:xd0D0ekVts/UDBbjeDSs4wGlBfcarJDg0MMhVgHbxhs= github.com/nikofil/mautrix-go v0.5.2-0.20200911232449-6010305aed05 h1:WFyJHdXasAvpno0OSvKgfmZHlq0WoyK+254vxmz4Mag= github.com/nikofil/mautrix-go v0.5.2-0.20200911232449-6010305aed05/go.mod h1:xd0D0ekVts/UDBbjeDSs4wGlBfcarJDg0MMhVgHbxhs= +github.com/nikofil/mautrix-go v0.5.2-0.20200911234625-a585557b3750 h1:3eUgrAhYHnI0HidL2uO1uga8dpnqpAXIN0DB7uWc95Y= +github.com/nikofil/mautrix-go v0.5.2-0.20200911234625-a585557b3750/go.mod h1:xd0D0ekVts/UDBbjeDSs4wGlBfcarJDg0MMhVgHbxhs= github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/matrix/uia-fallback.go b/matrix/uia-fallback.go index 1501ad9..6b2e42a 100644 --- a/matrix/uia-fallback.go +++ b/matrix/uia-fallback.go @@ -42,6 +42,7 @@ const uiaFallbackPage = `

Please complete the login in the popup window

+

Keep this page open while logging in, it will close automatically after the login finishes.