Skip to content

crypto: drop cached own cross-signing keys when they change on the server #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iFixRobots merged 1 commit into from
Oct 22, 2026
Merged

crypto: drop cached own cross-signing keys when they change on the server #635

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions crypto/cross_sign_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,31 @@ func (mach *OlmMachine) storeCrossSigningKeys(ctx context.Context, crossSigningK
}
}

if userID == mach.Client.UserID && mach.CrossSigningKeys != nil {
ownKeys := mach.CrossSigningKeys.PublicKeys()
for _, usage := range userKeys.Usage {
var ownKey id.Ed25519
switch usage {
case id.XSUsageMaster:
ownKey = ownKeys.MasterKey
case id.XSUsageSelfSigning:
ownKey = ownKeys.SelfSigningKey
case id.XSUsageUserSigning:
ownKey = ownKeys.UserSigningKey
default:
continue
}
if _, ok := userKeys.Keys[id.NewKeyID(id.KeyAlgorithmEd25519, ownKey.String())]; !ok {
log.Warn().
Str("usage", string(usage)).
Stringer("private_key", ownKey).
Msg("Own cross-signing key changed, dropping cached private keys")
mach.CrossSigningKeys = nil
break
}
}
}

// Clear internal cache so that it refreshes from crypto store
if userID == mach.Client.UserID && mach.crossSigningPubkeys != nil {
log.Debug().Msg("Resetting internal cross-signing key cache")
Expand Down
Loading