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

fix: Migrate more from protobuf

Browse Source
This commit is contained in:
PapaTutuWawa 2022-08-05 13:02:44 +02:00
parent 9ed94c8f3a
commit ff7cc8e95a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/src/double_ratchet/crypto.dart
View File

@ -1,7 +1,8 @@
import 'package:omemo_dart/protobuf/schema.pb.dart';
import 'package:omemo_dart/src/crypto.dart'; import 'package:omemo_dart/src/crypto.dart';
import 'package:omemo_dart/src/errors.dart'; import 'package:omemo_dart/src/errors.dart';
import 'package:omemo_dart/src/helpers.dart'; import 'package:omemo_dart/src/helpers.dart';
import 'package:omemo_dart/src/protobuf/omemo_authenticated_message.dart';
import 'package:omemo_dart/src/protobuf/omemo_message.dart';
/// Info string for ENCRYPT /// Info string for ENCRYPT
const encryptHkdfInfoString = 'OMEMO Message Key Material'; const encryptHkdfInfoString = 'OMEMO Message Key Material';
@ -14,12 +15,12 @@ Future<List<int>> encrypt(List<int> mk, List<int> plaintext, List<int> associate
final keys = await deriveEncryptionKeys(mk, encryptHkdfInfoString); final keys = await deriveEncryptionKeys(mk, encryptHkdfInfoString);
final ciphertext = await aes256CbcEncrypt(plaintext, keys.encryptionKey, keys.iv); final ciphertext = await aes256CbcEncrypt(plaintext, keys.encryptionKey, keys.iv);
final header = OMEMOMessage.fromBuffer(associatedData.sublist(sessionAd.length)) final header = OmemoMessage.fromBuffer(associatedData.sublist(sessionAd.length))
..ciphertext = ciphertext; ..ciphertext = ciphertext;
final headerBytes = header.writeToBuffer(); final headerBytes = header.writeToBuffer();
final hmacInput = concat([sessionAd, headerBytes]); final hmacInput = concat([sessionAd, headerBytes]);
final hmacResult = await truncatedHmac(hmacInput, keys.authenticationKey); final hmacResult = await truncatedHmac(hmacInput, keys.authenticationKey);
final message = OMEMOAuthenticatedMessage() final message = OmemoAuthenticatedMessage()
..mac = hmacResult ..mac = hmacResult
..message = headerBytes; ..message = headerBytes;
return message.writeToBuffer(); return message.writeToBuffer();
@ -33,15 +34,15 @@ Future<List<int>> decrypt(List<int> mk, List<int> ciphertext, List<int> associat
final keys = await deriveEncryptionKeys(mk, encryptHkdfInfoString); final keys = await deriveEncryptionKeys(mk, encryptHkdfInfoString);
// Assumption ciphertext is a OMEMOAuthenticatedMessage // Assumption ciphertext is a OMEMOAuthenticatedMessage
final message = OMEMOAuthenticatedMessage.fromBuffer(ciphertext); final message = OmemoAuthenticatedMessage.fromBuffer(ciphertext);
final header = OMEMOMessage.fromBuffer(message.message); final header = OmemoMessage.fromBuffer(message.message!);
final hmacInput = concat([sessionAd, header.writeToBuffer()]); final hmacInput = concat([sessionAd, header.writeToBuffer()]);
final hmacResult = await truncatedHmac(hmacInput, keys.authenticationKey); final hmacResult = await truncatedHmac(hmacInput, keys.authenticationKey);
if (!listsEqual(hmacResult, message.mac)) { if (!listsEqual(hmacResult, message.mac!)) {
throw InvalidMessageHMACException(); throw InvalidMessageHMACException();
} }
return aes256CbcDecrypt(header.ciphertext, keys.encryptionKey, keys.iv); return aes256CbcDecrypt(header.ciphertext!, keys.encryptionKey, keys.iv);
} }