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

fix: Do not keep the old SPK signature

Browse Source
This commit is contained in:
PapaTutuWawa 2022-08-08 15:50:00 +02:00
parent 1bcbf27c83
commit 5b739aaf1a
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/src/omemo/device.dart
View File

@ -19,7 +19,6 @@ class Device {
this.spkSignature, this.spkSignature,
this.oldSpk, this.oldSpk,
this.oldSpkId, this.oldSpkId,
this.oldSpkSignature,
this.opks, this.opks,
); );
@ -41,7 +40,6 @@ class Device {
'old_spk': 'base/64/encoded', 'old_spk': 'base/64/encoded',
'old_spk_pub': 'base/64/encoded', 'old_spk_pub': 'base/64/encoded',
'old_spk_id': 122, 'old_spk_id': 122,
'old_ spk_sig': 'base/64/encoded',
'opks': [ 'opks': [
{ {
'id': 0, 'id': 0,
@ -81,7 +79,6 @@ class Device {
KeyPairType.x25519, KeyPairType.x25519,
), ),
data['old_spk_id'] as int?, data['old_spk_id'] as int?,
base64DecodeIfNotNull(data, 'old_spk_sig'),
opks, opks,
); );
} }
@ -99,7 +96,7 @@ class Device {
opks[i] = await OmemoKeyPair.generateNewPair(KeyPairType.x25519); opks[i] = await OmemoKeyPair.generateNewPair(KeyPairType.x25519);
} }
return Device(jid, id, ik, spk, spkId, signature, null, null, null, opks); return Device(jid, id, ik, spk, spkId, signature, null, null, opks);
} }
/// Our bare Jid /// Our bare Jid
@ -120,10 +117,8 @@ class Device {
/// The old Signed Prekey... /// The old Signed Prekey...
final OmemoKeyPair? oldSpk; final OmemoKeyPair? oldSpk;
/// its Id, ... /// ...and its Id
final int? oldSpkId; final int? oldSpkId;
/// ...and its signature
final List<int>? oldSpkSignature;
/// Map of an id to the associated Onetime-Prekey /// Map of an id to the associated Onetime-Prekey
final Map<int, OmemoKeyPair> opks; final Map<int, OmemoKeyPair> opks;
@ -143,7 +138,6 @@ class Device {
spkSignature, spkSignature,
oldSpk, oldSpk,
oldSpkId, oldSpkId,
oldSpkSignature,
opks, opks,
); );
} }
@ -165,7 +159,6 @@ class Device {
newSignature, newSignature,
spk, spk,
spkId, spkId,
spkSignature,
opks, opks,
); );
} }
@ -213,7 +206,6 @@ class Device {
'old_spk': base64EncodeIfNotNull(await oldSpk?.sk.getBytes()), 'old_spk': base64EncodeIfNotNull(await oldSpk?.sk.getBytes()),
'old_spk_pub': base64EncodeIfNotNull(await oldSpk?.pk.getBytes()), 'old_spk_pub': base64EncodeIfNotNull(await oldSpk?.pk.getBytes()),
'old_spk_id': oldSpkId, 'old_spk_id': oldSpkId,
'old_spk_sig': base64EncodeIfNotNull(oldSpkSignature),
'opks': serialisedOpks, 'opks': serialisedOpks,
}; };
} }
@ -239,7 +231,6 @@ class Device {
final spkMatch = await spk.equals(other.spk); final spkMatch = await spk.equals(other.spk);
// ignore: invalid_use_of_visible_for_testing_member // ignore: invalid_use_of_visible_for_testing_member
final oldSpkMatch = oldSpk != null ? await oldSpk!.equals(other.oldSpk!) : other.oldSpk == null; final oldSpkMatch = oldSpk != null ? await oldSpk!.equals(other.oldSpk!) : other.oldSpk == null;
final oldSpkSigsMatch = oldSpkSignature != null ? listsEqual(oldSpkSignature!, other.oldSpkSignature!) : other.oldSpkSignature == null;
return id == other.id && return id == other.id &&
ikMatch && ikMatch &&
spkMatch && spkMatch &&
@ -248,7 +239,6 @@ class Device {
listsEqual(spkSignature, other.spkSignature) && listsEqual(spkSignature, other.spkSignature) &&
spkId == other.spkId && spkId == other.spkId &&
oldSpkId == other.oldSpkId && oldSpkId == other.oldSpkId &&
oldSpkSigsMatch &&
opksMatch; opksMatch;
} }
} }

1
test/omemo_test.dart
View File

@ -247,7 +247,6 @@ void main() {
expect(await newDevice!.oldSpk!.equals(oldDevice.spk), true); expect(await newDevice!.oldSpk!.equals(oldDevice.spk), true);
expect(newDevice!.oldSpkId, oldDevice.spkId); expect(newDevice!.oldSpkId, oldDevice.spkId);
expect(listsEqual(newDevice!.oldSpkSignature!, oldDevice.spkSignature), true);
}); });
test('Test accepting a session with an old SPK', () async { test('Test accepting a session with an old SPK', () async {