moved argon2 function proxy into kdbx library.

lib/kdbx.dart

@@ -1,6 +1,7 @@
 /// dart library for reading keepass file format (kdbx).
 library kdbx;
 
+export 'src/crypto/argon2.dart';
 export 'src/crypto/key_encrypter_kdf.dart' show Argon2;
 export 'src/crypto/protected_value.dart'
     show ProtectedValue, StringValue, PlainValue;

lib/src/crypto/argon2.dart

@@ -0,0 +1,91 @@
+import 'dart:convert';
+import 'dart:ffi';
+import 'dart:typed_data';
+
+import 'package:ffi/ffi.dart';
+import 'package:ffi_helper/ffi_helper.dart';
+import 'package:meta/meta.dart';
+
+typedef Argon2HashNative = Pointer<Utf8> Function(
+  Pointer<Uint8> key,
+  IntPtr keyLen,
+  Pointer<Uint8> salt,
+  Uint64 saltlen,
+  Uint32 m_cost, // memory cost
+  Uint32 t_cost, // time cost (number iterations)
+  Uint32 parallelism,
+  IntPtr hashlen,
+  Uint8 type,
+  Uint32 version,
+);
+
+typedef Argon2Hash = Pointer<Utf8> Function(
+  Pointer<Uint8> key,
+  int keyLen,
+  Pointer<Uint8> salt,
+  int saltlen,
+  int m_cost, // memory cost
+  int t_cost, // time cost (number iterations)
+  int parallelism,
+  int hashlen,
+  int type,
+  int version,
+);
+
+abstract class Argon2 {
+  Uint8List argon2(
+    Uint8List key,
+    Uint8List salt,
+    int memory,
+    int iterations,
+    int length,
+    int parallelism,
+    int type,
+    int version,
+  );
+}
+
+abstract class Argon2Base extends Argon2 {
+  @protected
+  Argon2Hash get argon2hash;
+
+  @override
+  Uint8List argon2(
+    Uint8List key,
+    Uint8List salt,
+    int memory,
+    int iterations,
+    int length,
+    int parallelism,
+    int type,
+    int version,
+  ) {
+    final keyArray = Uint8Array.fromTypedList(key);
+//    final saltArray = Uint8Array.fromTypedList(salt);
+    final saltArray = allocate<Uint8>(count: salt.length);
+    final saltList = saltArray.asTypedList(length);
+    saltList.setAll(0, salt);
+//    const memoryCost = 1 << 16;
+
+//    _logger.fine('saltArray: ${ByteUtils.toHexList(saltArray.view)}');
+
+    final result = argon2hash(
+      keyArray.rawPtr,
+      keyArray.length,
+      saltArray,
+      salt.length,
+      memory,
+      iterations,
+      parallelism,
+      length,
+      type,
+      version,
+    );
+
+    keyArray.free();
+//    saltArray.free();
+    free(saltArray);
+    final resultString = Utf8.fromUtf8(result);
+    return base64.decode(resultString);
+  }
+}

lib/src/crypto/key_encrypter_kdf.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:kdbx/kdbx.dart';
+import 'package:kdbx/src/crypto/argon2.dart';
 import 'package:kdbx/src/internal/byte_utils.dart';
 import 'package:kdbx/src/kdbx_var_dictionary.dart';
 import 'package:logging/logging.dart';
@@ -106,16 +107,3 @@ class KeyEncrypterKdf {
     );
   }
 }
-
-abstract class Argon2 {
-  Uint8List argon2(
-    Uint8List key,
-    Uint8List salt,
-    int memory,
-    int iterations,
-    int length,
-    int parallelism,
-    int type,
-    int version,
-  );
-}

lib/src/kdbx_format.dart

@@ -6,6 +6,7 @@ import 'dart:typed_data';
 import 'package:convert/convert.dart' as convert;
 import 'package:crypto/crypto.dart' as crypto;
 import 'package:kdbx/kdbx.dart';
+import 'package:kdbx/src/crypto/argon2.dart';
 import 'package:kdbx/src/crypto/key_encrypter_kdf.dart';
 import 'package:kdbx/src/crypto/protected_salt_generator.dart';
 import 'package:kdbx/src/crypto/protected_value.dart';

pubspec.yaml

@@ -26,11 +26,11 @@ dependencies:
   args: '>1.5.0 <2.0.0'
   prompts: '>=1.3.0 <2.0.0'
   logging_appenders: '>=0.1.0 <1.0.0'
+  ffi: ^0.1.3
   ffi_helper: ^1.4.0
 
 dev_dependencies:
   pedantic: '>=1.7.0 <2.0.0'
   test: '>=1.6.0 <2.0.0'
-  ffi: ^0.1.3
 
 

test/kdbx4_test.dart

@@ -4,9 +4,7 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:ffi/ffi.dart';
-import 'package:ffi_helper/ffi_helper.dart';
 import 'package:kdbx/kdbx.dart';
-import 'package:kdbx/src/crypto/key_encrypter_kdf.dart';
 import 'package:kdbx/src/kdbx_header.dart';
 import 'package:logging/logging.dart';
 import 'package:logging_appenders/logging_appenders.dart';
@@ -42,57 +40,18 @@ typedef Argon2Hash = Pointer<Utf8> Function(
   int version,
 );
 
-class Argon2Test implements Argon2 {
+class Argon2Test extends Argon2Base {
   Argon2Test() {
     final argon2lib = Platform.isMacOS
         ? DynamicLibrary.open('libargon2_ffi.dylib')
         : DynamicLibrary.open('./libargon2_ffi.so');
-    _argon2hash = argon2lib
+    argon2hash = argon2lib
         .lookup<NativeFunction<Argon2HashNative>>('hp_argon2_hash')
         .asFunction();
   }
-  Argon2Hash _argon2hash;
 
   @override
-  Uint8List argon2(
+  Argon2Hash argon2hash;
-    Uint8List key,
-    Uint8List salt,
-    int memory,
-    int iterations,
-    int length,
-    int parallelism,
-    int type,
-    int version,
-  ) {
-    final keyArray = Uint8Array.fromTypedList(key);
-//    final saltArray = Uint8Array.fromTypedList(salt);
-    final saltArray = allocate<Uint8>(count: salt.length);
-    final saltList = saltArray.asTypedList(length);
-    saltList.setAll(0, salt);
-//    const memoryCost = 1 << 16;
-
-//    _logger.fine('saltArray: ${ByteUtils.toHexList(saltArray.view)}');
-
-    final result = _argon2hash(
-      keyArray.rawPtr,
-      keyArray.length,
-      saltArray,
-      salt.length,
-      memory,
-      iterations,
-      parallelism,
-      length,
-      type,
-      version,
-    );
-    keyArray.free();
-//    saltArray.free();
-    free(saltArray);
-    final resultString = Utf8.fromUtf8(result);
-    return base64.decode(resultString);
-  }
-//  String hashStuff(String password) =>
-//      Utf8.fromUtf8(_hashStuff(Utf8.toUtf8(password)));
 }
 
 void main() {