From cd4da937321159a71809df40bda4e3778c32d21b Mon Sep 17 00:00:00 2001 From: Herbert Poul Date: Sat, 29 Aug 2020 13:05:14 +0200 Subject: [PATCH] move byte utils into utils package, export ByteUtils. --- example/pubspec.lock | 2 +- lib/kdbx.dart | 1 + lib/src/crypto/key_encrypter_kdf.dart | 2 +- lib/src/kdbx_binary.dart | 2 +- lib/src/kdbx_format.dart | 2 +- lib/src/kdbx_header.dart | 2 +- lib/src/kdbx_var_dictionary.dart | 2 +- lib/src/kdbx_xml.dart | 2 +- lib/src/{internal => utils}/byte_utils.dart | 0 test/internal/byte_utils_test.dart | 2 +- test/var_dictionary_test.dart | 2 +- 11 files changed, 10 insertions(+), 9 deletions(-) rename lib/src/{internal => utils}/byte_utils.dart (100%) diff --git a/example/pubspec.lock b/example/pubspec.lock index 0b35e9e..16973cc 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -14,7 +14,7 @@ packages: name: argon2_ffi_base url: "https://pub.dartlang.org" source: hosted - version: "0.1.4+3" + version: "0.1.4+6" args: dependency: transitive description: diff --git a/lib/kdbx.dart b/lib/kdbx.dart index 992f5f9..be1dc2f 100644 --- a/lib/kdbx.dart +++ b/lib/kdbx.dart @@ -22,3 +22,4 @@ export 'src/kdbx_header.dart' KdbxVersion; export 'src/kdbx_meta.dart'; export 'src/kdbx_object.dart'; +export 'src/utils/byte_utils.dart' show ByteUtils; diff --git a/lib/src/crypto/key_encrypter_kdf.dart b/lib/src/crypto/key_encrypter_kdf.dart index 7943fa2..5973e43 100644 --- a/lib/src/crypto/key_encrypter_kdf.dart +++ b/lib/src/crypto/key_encrypter_kdf.dart @@ -5,7 +5,7 @@ import 'package:argon2_ffi_base/argon2_ffi_base.dart'; import 'package:crypto/crypto.dart' as crypto; import 'package:isolate/isolate_runner.dart'; import 'package:kdbx/kdbx.dart'; -import 'package:kdbx/src/internal/byte_utils.dart'; +import 'package:kdbx/src/utils/byte_utils.dart'; import 'package:kdbx/src/kdbx_var_dictionary.dart'; import 'package:logging/logging.dart'; import 'package:pointycastle/export.dart'; diff --git a/lib/src/kdbx_binary.dart b/lib/src/kdbx_binary.dart index a880cbd..d1f3065 100644 --- a/lib/src/kdbx_binary.dart +++ b/lib/src/kdbx_binary.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; -import 'package:kdbx/src/internal/byte_utils.dart'; +import 'package:kdbx/src/utils/byte_utils.dart'; import 'package:kdbx/src/kdbx_header.dart'; import 'package:kdbx/src/kdbx_xml.dart'; import 'package:meta/meta.dart'; diff --git a/lib/src/kdbx_format.dart b/lib/src/kdbx_format.dart index 1746d17..9a5b10d 100644 --- a/lib/src/kdbx_format.dart +++ b/lib/src/kdbx_format.dart @@ -12,7 +12,7 @@ import 'package:kdbx/kdbx.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'; -import 'package:kdbx/src/internal/byte_utils.dart'; +import 'package:kdbx/src/utils/byte_utils.dart'; import 'package:kdbx/src/internal/consts.dart'; import 'package:kdbx/src/internal/crypto_utils.dart'; import 'package:kdbx/src/kdbx_binary.dart'; diff --git a/lib/src/kdbx_header.dart b/lib/src/kdbx_header.dart index 98d5f7d..16098bb 100644 --- a/lib/src/kdbx_header.dart +++ b/lib/src/kdbx_header.dart @@ -2,7 +2,7 @@ import 'dart:typed_data'; import 'package:crypto/crypto.dart' as crypto; import 'package:kdbx/src/crypto/key_encrypter_kdf.dart'; -import 'package:kdbx/src/internal/byte_utils.dart'; +import 'package:kdbx/src/utils/byte_utils.dart'; import 'package:kdbx/src/internal/consts.dart'; import 'package:kdbx/src/kdbx_binary.dart'; import 'package:kdbx/src/kdbx_var_dictionary.dart'; diff --git a/lib/src/kdbx_var_dictionary.dart b/lib/src/kdbx_var_dictionary.dart index 0ed250d..30a443a 100644 --- a/lib/src/kdbx_var_dictionary.dart +++ b/lib/src/kdbx_var_dictionary.dart @@ -1,6 +1,6 @@ import 'dart:typed_data'; -import 'package:kdbx/src/internal/byte_utils.dart'; +import 'package:kdbx/src/utils/byte_utils.dart'; import 'package:logging/logging.dart'; import 'package:meta/meta.dart'; diff --git a/lib/src/kdbx_xml.dart b/lib/src/kdbx_xml.dart index 4503a85..aef289b 100644 --- a/lib/src/kdbx_xml.dart +++ b/lib/src/kdbx_xml.dart @@ -3,7 +3,7 @@ import 'dart:typed_data'; import 'package:clock/clock.dart'; import 'package:kdbx/kdbx.dart'; -import 'package:kdbx/src/internal/byte_utils.dart'; +import 'package:kdbx/src/utils/byte_utils.dart'; import 'package:kdbx/src/kdbx_consts.dart'; import 'package:meta/meta.dart'; import 'package:xml/xml.dart'; diff --git a/lib/src/internal/byte_utils.dart b/lib/src/utils/byte_utils.dart similarity index 100% rename from lib/src/internal/byte_utils.dart rename to lib/src/utils/byte_utils.dart diff --git a/test/internal/byte_utils_test.dart b/test/internal/byte_utils_test.dart index 340478e..82a1dca 100644 --- a/test/internal/byte_utils_test.dart +++ b/test/internal/byte_utils_test.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:kdbx/src/internal/byte_utils.dart'; +import 'package:kdbx/src/utils/byte_utils.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/var_dictionary_test.dart b/test/var_dictionary_test.dart index e877afb..5cf36c1 100644 --- a/test/var_dictionary_test.dart +++ b/test/var_dictionary_test.dart @@ -1,5 +1,5 @@ import 'package:kdbx/src/crypto/key_encrypter_kdf.dart'; -import 'package:kdbx/src/internal/byte_utils.dart'; +import 'package:kdbx/src/utils/byte_utils.dart'; import 'package:kdbx/src/kdbx_var_dictionary.dart'; import 'package:logging/logging.dart'; import 'package:logging_appenders/logging_appenders.dart';