deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 22:35:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

WIP: verification: add log of master key

Browse source 
Signed-off-by: Sumner Evans <sumner@beeper.com>
This commit is contained in:
Sumner Evans 2024-03-06 14:16:19 -07:00
commit bcd01e0a3f
No known key found for this signature in database
GPG key ID: 8904527AB50022FD
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crypto/verificationhelper/reciprocate.go
View file

@ -9,6 +9,7 @@ package verificationhelper
import (
"bytes"
"context"
"encoding/base64"
"fmt"
"golang.org/x/exp/slices"
@ -60,8 +61,7 @@ func (vh *VerificationHelper) HandleScannedQRData(ctx context.Context, data []by
}
// Verify the master key is correct
crossSigningPubkeys := vh.mach.GetOwnCrossSigningPublicKeys(ctx)
if bytes.Equal(crossSigningPubkeys.MasterKey.Bytes(), qrCode.Key1[:]) {
if bytes.Equal(vh.mach.GetOwnCrossSigningPublicKeys(ctx).MasterKey.Bytes(), qrCode.Key1[:]) {
log.Info().Msg("Verified that the other device has the same master key")
} else {
return fmt.Errorf("the master key does not match")
@ -100,6 +100,11 @@ func (vh *VerificationHelper) HandleScannedQRData(ctx context.Context, data []by
}
// Verify that what they think the master key is is correct.
log.Info().
Stringer("master_key", vh.mach.GetOwnCrossSigningPublicKeys(ctx).MasterKey).
Str("key2", base64.StdEncoding.EncodeToString(qrCode.Key2[:])).
Msg("verifying master key")
if bytes.Equal(vh.mach.GetOwnCrossSigningPublicKeys(ctx).MasterKey.Bytes(), qrCode.Key2[:]) {
log.Info().Msg("Verified that the other device has the correct master key")
} else {