feat: Remove the KEX timestamp from the double ratchet data
This commit is contained in:
parent
fe2b090ea0
commit
4baf8187e1
@ -70,7 +70,6 @@ class OmemoDoubleRatchet {
|
||||
this.sessionAd,
|
||||
this.mkSkipped, // MKSKIPPED
|
||||
this.acknowledged,
|
||||
this.kexTimestamp,
|
||||
this.kex,
|
||||
);
|
||||
|
||||
@ -104,10 +103,6 @@ class OmemoDoubleRatchet {
|
||||
/// List of skipped message keys.
|
||||
final Map<SkippedKey, List<int>> mkSkipped;
|
||||
|
||||
/// The point in time at which we performed the kex exchange to create this ratchet.
|
||||
/// Precision is milliseconds since epoch.
|
||||
int kexTimestamp;
|
||||
|
||||
/// The key exchange that was used for initiating the session.
|
||||
final KeyExchangeData kex;
|
||||
|
||||
@ -126,7 +121,6 @@ class OmemoDoubleRatchet {
|
||||
OmemoPublicKey ek,
|
||||
List<int> sk,
|
||||
List<int> ad,
|
||||
int timestamp,
|
||||
int pkId,
|
||||
) async {
|
||||
final dhs = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
|
||||
@ -145,7 +139,6 @@ class OmemoDoubleRatchet {
|
||||
ad,
|
||||
{},
|
||||
false,
|
||||
timestamp,
|
||||
KeyExchangeData(
|
||||
pkId,
|
||||
spkId,
|
||||
@ -167,7 +160,6 @@ class OmemoDoubleRatchet {
|
||||
OmemoPublicKey ek,
|
||||
List<int> sk,
|
||||
List<int> ad,
|
||||
int kexTimestamp,
|
||||
) async {
|
||||
return OmemoDoubleRatchet(
|
||||
spk,
|
||||
@ -182,7 +174,6 @@ class OmemoDoubleRatchet {
|
||||
ad,
|
||||
{},
|
||||
true,
|
||||
kexTimestamp,
|
||||
KeyExchangeData(
|
||||
pkId,
|
||||
spkId,
|
||||
@ -384,7 +375,6 @@ class OmemoDoubleRatchet {
|
||||
sessionAd,
|
||||
Map<SkippedKey, List<int>>.from(mkSkipped),
|
||||
acknowledged,
|
||||
kexTimestamp,
|
||||
kex,
|
||||
);
|
||||
}
|
||||
@ -426,7 +416,6 @@ class OmemoDoubleRatchet {
|
||||
ns == other.ns &&
|
||||
nr == other.nr &&
|
||||
pn == other.pn &&
|
||||
listsEqual(sessionAd, other.sessionAd) &&
|
||||
kexTimestamp == other.kexTimestamp;
|
||||
listsEqual(sessionAd, other.sessionAd);
|
||||
}
|
||||
}
|
||||
|
@ -431,7 +431,6 @@ class OmemoManager {
|
||||
kexEk,
|
||||
kex.sk,
|
||||
kex.ad,
|
||||
getTimestamp(),
|
||||
);
|
||||
|
||||
final keyAndHmac = await ratchet.ratchetDecrypt(
|
||||
@ -672,7 +671,6 @@ class OmemoManager {
|
||||
kexResult.ek.pk,
|
||||
kexResult.sk,
|
||||
kexResult.ad,
|
||||
getTimestamp(),
|
||||
kexResult.opkId,
|
||||
);
|
||||
|
||||
|
@ -58,7 +58,6 @@ void main() {
|
||||
resultAlice.ek.pk,
|
||||
resultAlice.sk,
|
||||
resultAlice.ad,
|
||||
0,
|
||||
resultAlice.opkId,
|
||||
);
|
||||
final bobsRatchet = await OmemoDoubleRatchet.acceptNewSession(
|
||||
@ -69,7 +68,6 @@ void main() {
|
||||
resultAlice.ek.pk,
|
||||
resultBob.sk,
|
||||
resultBob.ad,
|
||||
0,
|
||||
);
|
||||
|
||||
expect(alicesRatchet.sessionAd, bobsRatchet.sessionAd);
|
||||
|
Loading…
Reference in New Issue
Block a user