From 536ef4b717ce84c158fed5c97ebd20b2234bb1fe Mon Sep 17 00:00:00 2001 From: Kherel Date: Mon, 19 Apr 2021 14:37:51 +0200 Subject: [PATCH] add salt to hash --- lib/logic/models/user.dart | 4 ++-- lib/ui/pages/server_details/chart.dart | 1 + lib/utils/crypto.dart | 10 ---------- pubspec.lock | 7 +++++++ pubspec.yaml | 1 + 5 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 lib/utils/crypto.dart diff --git a/lib/logic/models/user.dart b/lib/logic/models/user.dart index 3df879c5..93440299 100644 --- a/lib/logic/models/user.dart +++ b/lib/logic/models/user.dart @@ -1,9 +1,9 @@ import 'dart:ui'; +import 'package:crypt/crypt.dart'; import 'package:equatable/equatable.dart'; import 'package:selfprivacy/utils/color_utils.dart'; import 'package:hive/hive.dart'; -import 'package:selfprivacy/utils/crypto.dart'; part 'user.g.dart'; @@ -25,7 +25,7 @@ class User extends Equatable { Color get color => stringToColor(login); - String get hashPassword => convertToSha512Hash(password); + String get hashPassword => Crypt.sha512(password).toString(); String toString() { return login; diff --git a/lib/ui/pages/server_details/chart.dart b/lib/ui/pages/server_details/chart.dart index 20c2a5fc..a53f1e09 100644 --- a/lib/ui/pages/server_details/chart.dart +++ b/lib/ui/pages/server_details/chart.dart @@ -5,6 +5,7 @@ class _Chart extends StatelessWidget { @override Widget build(BuildContext context) { + var cubit = context.watch(); var period = cubit.state.period; var state = cubit.state; diff --git a/lib/utils/crypto.dart b/lib/utils/crypto.dart deleted file mode 100644 index 092f1175..00000000 --- a/lib/utils/crypto.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'dart:convert'; - -import 'package:crypto/crypto.dart'; - -String convertToSha512Hash(String text) { - var bytes = utf8.encode(text); - - var hash = sha512.convert(bytes); - return hash.toString(); -} diff --git a/pubspec.lock b/pubspec.lock index 4ac79f5a..6e9b2757 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -176,6 +176,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.2" + crypt: + dependency: "direct main" + description: + name: crypt + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.1" crypto: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 79788c9c..83e61f3b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,6 +10,7 @@ environment: dependencies: flutter: sdk: flutter + crypt: ^4.0.1 crypto: ^3.0.0 cubit_form: ^1.0.0-nullsafety.0 cupertino_icons: ^1.0.2