Exports hashlib_codecs from current package

bitanon · Sep 11, 2024 · 0b33aaf · 0b33aaf
1 parent e540c2e
commit 0b33aaf
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.20.3
+
+- Exports hashlib_codecs from current package. To get it: `import 'package:hashlib/codecs.dart';`
+
 # 1.20.2
 
 - Modifies `Poly1305` interface: `poly1305` is now available as the builder.

diff --git a/README.md b/README.md
@@ -104,8 +104,8 @@ Check the [API Reference](https://pub.dev/documentation/hashlib/latest/) for det
 Examples can be found inside the `example` folder.
 
 ```dart
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 
 void main() {
   var text = "Happy Hashing!";
@@ -164,10 +164,10 @@ void main() {
   print('');
 
   // Examples of PBKDF2 key derivation
-  print("SHA256/HMAC/PBKDF2 => ${pbkdf2(pw, iv, 100).hex()}");
-  print("SHA1/HMAC/PBKDF2 => ${sha1.pbkdf2(iv, 100).hex(pw)}");
-  print("BLAKE2b-256/HMAC/PBKDF2 => ${blake2b256.pbkdf2(iv, 100).hex(pw)}");
-  print("BLAKE2b-256/MAC/PBKDF2 => ${blake2b256.mac.pbkdf2(iv, 100).hex(pw)}");
+  print("SHA256/HMAC/PBKDF2 => ${pbkdf2(pw, iv).hex()}");
+  print("BLAKE2b-256/HMAC/PBKDF2 => ${blake2b256.pbkdf2(iv).hex(pw)}");
+  print("BLAKE2b-256/MAC/PBKDF2 => ${blake2b256.mac.pbkdf2(iv).hex(pw)}");
+  print("SHA1/HMAC/PBKDF2 => ${sha1.pbkdf2(iv, iterations: 100).hex(pw)}");
   print('');
 
   // Examples of OTP generation

diff --git a/example/hashlib_example.dart b/example/hashlib_example.dart
@@ -1,5 +1,5 @@
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 
 void main() {
   var text = "Happy Hashing!";

diff --git a/example/otpauth_parser.dart b/example/otpauth_parser.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 
 /// Parse any otpauth URI
 OTPAuth parse(String keyUri) {

diff --git a/lib/codecs.dart b/lib/codecs.dart
@@ -0,0 +1,7 @@
+// Copyright (c) 2024, Sudipto Chandra
+// All rights reserved. Check LICENSE file for details.
+
+/// Implementations of fast and error resilient codecs
+library hashlib_codecs;
+
+export 'package:hashlib_codecs/hashlib_codecs.dart';
diff --git a/lib/src/algorithms/argon2/argon2.dart b/lib/src/algorithms/argon2/argon2.dart
@@ -1,8 +1,8 @@
 // Copyright (c) 2023, Sudipto Chandra
 // All rights reserved. Check LICENSE file for details.
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/src/core/kdf_base.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 
 import 'argon2_64bit.dart' if (dart.library.js) 'argon2_32bit.dart';
 import 'common.dart';

diff --git a/lib/src/algorithms/argon2/common.dart b/lib/src/algorithms/argon2/common.dart
@@ -3,9 +3,9 @@
 
 import 'dart:typed_data';
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/src/core/hash_digest.dart';
 import 'package:hashlib/src/random.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 
 const int _slices = 4;
 const int _minParallelism = 1;

diff --git a/lib/src/algorithms/bcrypt/bcrypt.dart b/lib/src/algorithms/bcrypt/bcrypt.dart
@@ -3,10 +3,10 @@
 
 import 'dart:typed_data';
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/src/algorithms/bcrypt/common.dart';
 import 'package:hashlib/src/algorithms/bcrypt/security.dart';
 import 'package:hashlib/src/core/kdf_base.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 
 class Bcrypt extends KeyDerivatorBase {
   final BcryptContext _ctx;

diff --git a/lib/src/algorithms/bcrypt/common.dart b/lib/src/algorithms/bcrypt/common.dart
@@ -3,10 +3,10 @@
 
 import 'dart:typed_data';
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/src/algorithms/bcrypt/bcrypt.dart';
 import 'package:hashlib/src/core/hash_digest.dart';
 import 'package:hashlib/src/random.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 
 enum BcryptVersion {
   /// This is a revised version of original v2 with UTF-8 character support

diff --git a/lib/src/argon2.dart b/lib/src/argon2.dart
@@ -1,8 +1,8 @@
 // Copyright (c) 2023, Sudipto Chandra
 // All rights reserved. Check LICENSE file for details.
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/src/algorithms/argon2/argon2.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 
 export 'package:hashlib/src/algorithms/argon2/argon2.dart';
 

diff --git a/lib/src/bcrypt.dart b/lib/src/bcrypt.dart
@@ -1,10 +1,10 @@
 // Copyright (c) 2024, Sudipto Chandra
 // All rights reserved. Check LICENSE file for details.
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/src/algorithms/bcrypt/bcrypt.dart';
 import 'package:hashlib/src/algorithms/bcrypt/common.dart';
 import 'package:hashlib/src/algorithms/bcrypt/security.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 
 export 'algorithms/bcrypt/bcrypt.dart' show Bcrypt;
 export 'algorithms/bcrypt/common.dart'

diff --git a/lib/src/core/hash_digest.dart b/lib/src/core/hash_digest.dart
@@ -4,7 +4,7 @@
 import 'dart:convert' as cvt;
 import 'dart:typed_data';
 
-import 'package:hashlib_codecs/hashlib_codecs.dart';
+import 'package:hashlib/codecs.dart';
 
 class HashDigest extends Object {
   final Uint8List bytes;
@@ -120,12 +120,17 @@ class HashDigest extends Object {
       return isEqual(Uint8List.view(other.buffer));
     } else if (other is String) {
       return isEqual(fromHex(other));
-    } else if (other is Iterable<int>) {
-      if (other is List<int>) {
-        if (other.length != bytes.length) {
+    } else if (other is List<int>) {
+      if (other.length != bytes.length) {
+        return false;
+      }
+      for (int i = 0; i < bytes.length; ++i) {
+        if (other[i] != bytes[i++]) {
           return false;
         }
       }
+      return true;
+    } else if (other is Iterable<int>) {
       int i = 0;
       for (int x in other) {
         if (i >= bytes.length || x != bytes[i++]) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: hashlib
 description: Secure hash functions, checksum generators, and key derivation algorithms optimized for Dart.
 homepage: https://github.com/bitanon/hashlib
-version: 1.20.2
+version: 1.20.3
 
 environment:
   sdk: '>=2.14.0 <4.0.0'

diff --git a/test/argon2_test.dart b/test/argon2_test.dart
@@ -3,8 +3,8 @@
 
 import 'dart:typed_data';
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/bcrypt_test.dart b/test/bcrypt_test.dart
@@ -3,8 +3,8 @@
 
 import 'dart:convert';
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/compare_test.dart b/test/compare_test.dart
@@ -9,8 +9,8 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:crypto/crypto.dart' as crypto;
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 import 'package:pointycastle/digests/blake2b.dart' as pc_blake2b;
 import 'package:pointycastle/digests/keccak.dart' as pc_keccak;
 import 'package:pointycastle/digests/md4.dart' as pc_md4;

diff --git a/test/core/hash_digest_test.dart b/test/core/hash_digest_test.dart
@@ -122,6 +122,11 @@ void main() {
       expect(digest.isEqual(byteArray), isTrue);
     });
 
+    test('isEqual returns true for equal byte iterables', () {
+      final byteIterables = {1, 2, 3, 4, 5, 6, 7, 8};
+      expect(digest.isEqual(byteIterables), isTrue);
+    });
+
     test('isEqual returns true for equal ByteBuffer', () {
       final buffer = bytes.buffer;
       expect(digest.isEqual(buffer), isTrue);

diff --git a/test/poly1305_test.dart b/test/poly1305_test.dart
@@ -3,8 +3,8 @@
 
 import 'dart:typed_data';
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 import 'package:test/test.dart';
 
 const cases = [

diff --git a/test/sha3_test.dart b/test/sha3_test.dart
@@ -1,8 +1,8 @@
 // Copyright (c) 2023, Sudipto Chandra
 // All rights reserved. Check LICENSE file for details.
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/xxh128_test.dart b/test/xxh128_test.dart
@@ -6,8 +6,8 @@
 
 import 'dart:typed_data';
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 import 'package:test/test.dart';
 
 const seed = 0x9e3779b185ebca8d;

diff --git a/test/xxh3_test.dart b/test/xxh3_test.dart
@@ -6,8 +6,8 @@
 
 import 'dart:typed_data';
 
+import 'package:hashlib/codecs.dart';
 import 'package:hashlib/hashlib.dart';
-import 'package:hashlib_codecs/hashlib_codecs.dart';
 import 'package:test/test.dart';
 
 const seed = 0x9e3779b185ebca8d;