beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove direct dependency on Sodium to make reviews easier

Browse source
This commit is contained in:
vishnukvmd 2023-10-03 23:40:29 +05:30
parent 01b155a172
commit 4ecf4bcf87
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/services/entity_service.dart
View file

@ -3,7 +3,6 @@ import 'dart:convert';
import 'dart:math';
import 'package:flutter/foundation.dart';
import 'package:flutter_sodium/flutter_sodium.dart';
import 'package:logging/logging.dart';
import "package:photos/core/configuration.dart";
import "package:photos/core/network/network.dart";
@ -62,8 +61,8 @@ class EntityService {
key,
);
final String encryptedData =
Sodium.bin2base64(encryptedKeyData.encryptedData!);
final String header = Sodium.bin2base64(encryptedKeyData.header!);
CryptoUtil.bin2base64(encryptedKeyData.encryptedData!);
final String header = CryptoUtil.bin2base64(encryptedKeyData.header!);
debugPrint("Adding entity of type: " + type.typeToString());
final EntityData data = id == null
? await _gateway.createEntity(type, encryptedData, header)
@ -121,9 +120,9 @@ class EntityService {
for (EntityData e in result) {
try {
final decryptedValue = await CryptoUtil.decryptChaCha(
Sodium.base642bin(e.encryptedData!),
CryptoUtil.base642bin(e.encryptedData!),
entityKey,
Sodium.base642bin(e.header!),
CryptoUtil.base642bin(e.header!),
);
final String plainText = utf8.decode(decryptedValue);
entities.add(
@ -166,17 +165,17 @@ class EntityService {
_prefs.setString(_getEntityHeaderPrefix(type), header);
}
final entityKey = CryptoUtil.decryptSync(
Sodium.base642bin(encryptedKey),
CryptoUtil.base642bin(encryptedKey),
_config.getKey()!,
Sodium.base642bin(header),
CryptoUtil.base642bin(header),
);
return entityKey;
} on EntityKeyNotFound {
_logger.info("EntityKeyNotFound generating key for type $type");
final key = CryptoUtil.generateKey();
final encryptedKeyData = CryptoUtil.encryptSync(key, _config.getKey()!);
encryptedKey = Sodium.bin2base64(encryptedKeyData.encryptedData!);
header = Sodium.bin2base64(encryptedKeyData.nonce!);
encryptedKey = CryptoUtil.bin2base64(encryptedKeyData.encryptedData!);
header = CryptoUtil.bin2base64(encryptedKeyData.nonce!);
await _gateway.createKey(type, encryptedKey, header);
await _prefs.setString(_getEntityKeyPrefix(type), encryptedKey);
await _prefs.setString(_getEntityHeaderPrefix(type), header);

7
lib/ui/account/request_pwd_verification_page.dart
View file

@ -2,7 +2,6 @@ import "dart:convert";
import "dart:typed_data";
import 'package:flutter/material.dart';
import "package:flutter_sodium/flutter_sodium.dart";
import "package:logging/logging.dart";
import 'package:photos/core/configuration.dart';
import "package:photos/l10n/l10n.dart";
@ -90,14 +89,14 @@ class _RequestPasswordVerificationPageState
final attributes = Configuration.instance.getKeyAttributes()!;
final Uint8List keyEncryptionKey = await CryptoUtil.deriveKey(
utf8.encode(_passwordController.text) as Uint8List,
Sodium.base642bin(attributes.kekSalt),
CryptoUtil.base642bin(attributes.kekSalt),
attributes.memLimit!,
attributes.opsLimit!,
);
CryptoUtil.decryptSync(
Sodium.base642bin(attributes.encryptedKey),
CryptoUtil.base642bin(attributes.encryptedKey),
keyEncryptionKey,
Sodium.base642bin(attributes.keyDecryptionNonce),
CryptoUtil.base642bin(attributes.keyDecryptionNonce),
);
dialog.show();
// pop