From da12c525966232151835584e02cdeda4059aff21 Mon Sep 17 00:00:00 2001 From: Igor Sirotin Date: Wed, 8 May 2024 17:00:15 +0100 Subject: [PATCH] fix_: loading hash_ratchet_encryption from database checks group_id --- protocol/encryption/persistence.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/protocol/encryption/persistence.go b/protocol/encryption/persistence.go index 3988aea03..cad46411c 100644 --- a/protocol/encryption/persistence.go +++ b/protocol/encryption/persistence.go @@ -764,7 +764,11 @@ func (s *sqlitePersistence) GetHashRatchetCache(ratchet *HashRatchetKeyCompatibi } } - err = tx.QueryRow("SELECT key FROM hash_ratchet_encryption WHERE key_id = ? OR deprecated_key_id = ?", keyID, ratchet.DeprecatedKeyID()).Scan(&key) + err = tx.QueryRow("SELECT key FROM hash_ratchet_encryption WHERE key_id = ? OR (deprecated_key_id = ? AND group_id = ?)", + keyID, + ratchet.DeprecatedKeyID(), + ratchet.GroupID, + ).Scan(&key) if err == sql.ErrNoRows { return nil, nil }