Skip to content

crypto: repair one-time keys when server has more than the account can store #633

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
+13 −0
Merged

crypto: repair one-time keys when server has more than the account can store #633

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
13 changes: 13 additions & 0 deletions crypto/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ type OlmMachine struct {
lastOTKUpload time.Time
receivedOTKsForSelf atomic.Bool
repairingOTKs atomic.Bool
otkRepairStarted atomic.Bool

CrossSigningKeys *CrossSigningKeysCache
crossSigningPubkeys *CrossSigningPublicKeysCache
Expand Down Expand Up @@ -887,6 +888,18 @@ func (mach *OlmMachine) ShareKeys(ctx context.Context, currentOTKCount int) erro
Int("server_count", resp.OneTimeKeyCounts.SignedCurve25519).
Msg("Fetched current OTK count from server")
currentOTKCount = resp.OneTimeKeyCounts.SignedCurve25519
if currentOTKCount > int(mach.account.Internal.MaxNumberOfOneTimeKeys()) && mach.otkRepairStarted.CompareAndSwap(false, true) {
log.Warn().
Int("server_count", currentOTKCount).
Msg("Server has more one-time keys than the account can store, repairing")
go func() {
err := mach.RepairOneTimeKeys(mach.backgroundCtx)
if err != nil {
log.Err(err).Msg("Failed to repair one-time keys")
}
}()
return nil
}
}
var deviceKeys *mautrix.DeviceKeys
if !mach.account.Shared {
Expand Down
Loading