PapaTutuWawa/omemo_dart
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: IMPLEMENT THE DOUBLE RATCHET WITH X3DH

Browse Source
This commit is contained in:
PapaTutuWawa
2022-08-03 15:29:13 +02:00
parent 4e3e20f08c
commit 1a0f470ada
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/src/double_ratchet.dart
View File

@@ -113,9 +113,9 @@ class OmemoDoubleRatchet {
cks = newCks;
final header = OMEMOMessage()
..n = ns
..dhPub = await dhs.pk.getBytes()
..pn = pn
..dhPub = await dhs.pk.getBytes();
..n = ns;
ns++;
@@ -127,8 +127,7 @@ class OmemoDoubleRatchet {
Future<List<int>?> trySkippedMessageKeys(OMEMOMessage header, List<int> ciphertext) async {
final key = SkippedKey(
// TODO(PapaTutuWawa): Is this correct
OmemoPublicKey.fromBytes(header.dhPub, KeyPairType.ed25519),
OmemoPublicKey.fromBytes(header.dhPub, KeyPairType.x25519),
header.n,
);
if (mkSkipped.containsKey(key)) {
@@ -162,13 +161,13 @@ class OmemoDoubleRatchet {
pn = header.n;
ns = 0;
nr = 0;
dhr = OmemoPublicKey.fromBytes(header.dhPub, KeyPairType.ed25519);
dhr = OmemoPublicKey.fromBytes(header.dhPub, KeyPairType.x25519);
final newRk = await kdfRk(rk, await dh(dhs, dhr!, 2));
final newRk = await kdfRk(rk, await dh(dhs, dhr!, 0));
rk = newRk;
ckr = newRk;
dhs = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
final newNewRk = await kdfRk(rk, await dh(dhs, dhr!, 2));
final newNewRk = await kdfRk(rk, await dh(dhs, dhr!, 0));
rk = newNewRk;
cks = newNewRk;
}