From 1aed6aa94d6edcb7a0ffdb46aa674ff2b4143562 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 23 Jun 2022 14:43:43 +0300 Subject: [PATCH] Update mautrix-go to add proper TOFU --- example-config.yaml | 7 ++++--- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/example-config.yaml b/example-config.yaml index 8d813b2..bdf51f7 100644 --- a/example-config.yaml +++ b/example-config.yaml @@ -315,9 +315,10 @@ bridge: # # Valid levels: # unverified - Send keys to all device in the room. - # cross-signed - Require valid cross-signing. TOFU for the cross-signing keys themselves. - # cross-signed-trusted - Require valid cross-signing, plus a valid user signature from the bridge bot. - # Note that creating user signatures from the bridge bot is not currently possible. + # cross-signed-untrusted - Require valid cross-signing, but trust all cross-signing keys. + # cross-signed-tofu - Require valid cross-signing, trust cross-signing keys on first use (and reject changes). + # cross-signed-verified - Require valid cross-signing, plus a valid user signature from the bridge bot. + # Note that creating user signatures from the bridge bot is not currently possible. # verified - Require manual per-device verification # (currently only possible by modifying the `trust` column in the `crypto_device` database table). verification_levels: diff --git a/go.mod b/go.mod index e5504f3..dd956c4 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( golang.org/x/net v0.0.0-20220513224357-95641704303c google.golang.org/protobuf v1.28.0 maunium.net/go/maulogger/v2 v2.3.2 - maunium.net/go/mautrix v0.11.1-0.20220622190947-d32425a24edb + maunium.net/go/mautrix v0.11.1-0.20220623114205-916294467210 ) require ( diff --git a/go.sum b/go.sum index e330ad6..dd245f1 100644 --- a/go.sum +++ b/go.sum @@ -107,5 +107,5 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M= maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA= maunium.net/go/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0= maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A= -maunium.net/go/mautrix v0.11.1-0.20220622190947-d32425a24edb h1:79pFgrAZ/iujzTgR/yJlDsDkiUg2ylQXJiMBspbS/9Y= -maunium.net/go/mautrix v0.11.1-0.20220622190947-d32425a24edb/go.mod h1:CiKpMhAx5QZFHK03jpWb0iKI3sGU8x6+LfsOjDrcO8I= +maunium.net/go/mautrix v0.11.1-0.20220623114205-916294467210 h1:kGfVCBSV1QLMk09/4ufnGk7lMYAZuLNdlFOS+5D7XHU= +maunium.net/go/mautrix v0.11.1-0.20220623114205-916294467210/go.mod h1:CiKpMhAx5QZFHK03jpWb0iKI3sGU8x6+LfsOjDrcO8I=