Adds more tests to increase coverage

Author: dipu-bd

.github/workflows/test.yml

@@ -24,6 +24,11 @@ jobs:
         with:
           sdk: ${{ matrix.sdk }}
 
+      - name: 'Install global packages'
+        run: |
+          dart pub global activate coverage
+          dart pub global activate cobertura
+
       - name: Run tests with coverage
         run: bash ./scripts/coverage.sh
 
@@ -33,7 +38,6 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
 
   test-on-stable:
-    if: github.repository == 'bitanon/cipherlib'
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
@@ -59,10 +63,9 @@ jobs:
         run: dart test
 
   test-on-legacy:
-    if: github.repository == 'bitanon/cipherlib'
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, windows-latest]
         sdk: ['2.14.0']
     runs-on: ${{ matrix.os }}
     steps:
@@ -76,7 +79,6 @@ jobs:
         run: dart test
 
   test-on-beta:
-    if: github.repository == 'bitanon/cipherlib'
     strategy:
       matrix:
         os: [ubuntu-latest]

README.md

@@ -1,8 +1,8 @@
 # cipherlib
 
+[![plugin version](https://img.shields.io/pub/v/cipherlib?label=pub)](https://pub.dev/packages/cipherlib)
 [![test](https://github.com/bitanon/cipherlib/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/bitanon/cipherlib/actions/workflows/test.yml)
 [![codecov](https://codecov.io/gh/bitanon/cipherlib/graph/badge.svg?token=ISIYJ8MNI0)](https://codecov.io/gh/bitanon/cipherlib)
-[![plugin version](https://img.shields.io/pub/v/cipherlib?label=pub)](https://pub.dev/packages/cipherlib)
 [![dart support](https://img.shields.io/badge/dart-%3e%3d%202.14.0-39f?logo=dart)](https://dart.dev/guides/whats-new#september-8-2021-214-release)
 [![likes](https://img.shields.io/pub/likes/cipherlib?logo=dart)](https://pub.dev/packages/cipherlib/score)
 [![pub points](https://img.shields.io/pub/points/cipherlib?logo=dart&color=teal)](https://pub.dev/packages/cipherlib/score)

lib/src/algorithms/aes/cfb.dart

@@ -158,7 +158,7 @@ class AESInCFBModeDecryptSink extends CipherSink {
 /// Provides encryption for AES cipher in CFB mode.
 class AESInCFBModeEncrypt extends SaltedCipher {
   @override
-  String get name => "AES#encrypt/CFB";
+  String get name => "AES#encrypt/CFB/${Padding.none.name}";
 
   /// Key for the cipher
   final Uint8List key;
@@ -181,7 +181,7 @@ class AESInCFBModeEncrypt extends SaltedCipher {
 /// Provides decryption for AES cipher in CFB mode.
 class AESInCFBModeDecrypt extends SaltedCipher {
   @override
-  String get name => "AES#decrypt/CFB";
+  String get name => "AES#decrypt/CFB/${Padding.none.name}";
 
   /// Key for the cipher
   final Uint8List key;

lib/src/algorithms/aes/ctr.dart

@@ -97,7 +97,7 @@ class AESInCTRModeSink extends CipherSink {
 /// Provides AES cipher in CTR mode.
 class AESInCTRModeCipher extends SaltedCipher {
   @override
-  final String name = "AES/CTR";
+  String get name => "AES#cipher/CTR/${Padding.none.name}";
 
   /// Key for the cipher
   final Uint8List key;
@@ -140,9 +140,10 @@ class AESInCTRMode extends SaltedCollateCipher {
     }
     var iv8 = iv is Uint8List ? iv : Uint8List.fromList(iv);
     var key8 = key is Uint8List ? key : Uint8List.fromList(key);
+    var cipher = AESInCTRModeCipher(key8, iv8);
     return AESInCTRMode._(
-      encryptor: AESInCTRModeCipher(key8, iv8),
-      decryptor: AESInCTRModeCipher(key8, iv8),
+      encryptor: cipher,
+      decryptor: cipher,
     );
   }
 

lib/src/algorithms/aes/gcm.dart

@@ -398,7 +398,7 @@ class AESInGCMModeDecryptSink extends _AESInGCMModeSinkBase {
 /// Provides AES cipher in GCM mode for encryption.
 class AESInGCMModeEncrypt extends SaltedCipher {
   @override
-  final String name = "AES#encrypt/GCM";
+  String get name => "AES#encrypt/GCM/${Padding.none.name}";
 
   /// Key for the cipher
   final Uint8List key;
@@ -425,7 +425,7 @@ class AESInGCMModeEncrypt extends SaltedCipher {
 /// Provides AES cipher in GCM mode for decryption.
 class AESInGCMModeDecrypt extends SaltedCipher {
   @override
-  final String name = "AES#decrypt/GCM";
+  String get name => "AES#decrypt/GCM/${Padding.none.name}";
 
   /// Key for the cipher
   final Uint8List key;

lib/src/algorithms/aes/ofb.dart

@@ -86,7 +86,7 @@ class AESInOFBModeSink extends CipherSink {
 /// Provides encryption for AES cipher in OFB mode.
 class AESInOFBModeCipher extends SaltedCipher {
   @override
-  final String name = "AES#cipher/OFB";
+  String get name => "AES#cipher/OFB/${Padding.none.name}";
 
   /// Key for the cipher
   final Uint8List key;

lib/src/algorithms/aes/xts.dart

@@ -3,6 +3,7 @@
 
 import 'dart:typed_data';
 
+import 'package:cipherlib/cipherlib.dart';
 import 'package:cipherlib/src/core/cipher_sink.dart';
 import 'package:cipherlib/src/core/salted_cipher.dart';
 import 'package:cipherlib/src/utils/nonce.dart';
@@ -327,7 +328,7 @@ class AESInXTSModeDecryptSink extends CipherSink {
 /// Provides encryption for AES cipher in XTS mode.
 class AESInXTSModeEncrypt extends SaltedCipher {
   @override
-  String get name => "AES#encrypt/XTS";
+  String get name => "AES#encrypt/XTS/${Padding.none.name}";
 
   /// Key for the plaintext encryption
   final Uint8List ekey;
@@ -350,7 +351,7 @@ class AESInXTSModeEncrypt extends SaltedCipher {
 /// Provides decryption for AES cipher in XTS mode.
 class AESInXTSModeDecrypt extends SaltedCipher {
   @override
-  String get name => "AES#decrypt/XTS";
+  String get name => "AES#decrypt/XTS/${Padding.none.name}";
 
   /// Key for the ciphertext decryption
   final Uint8List ekey;
@@ -373,7 +374,7 @@ class AESInXTSModeDecrypt extends SaltedCipher {
 /// Provides encryption and decryption for AES cipher in XTS mode.
 class AESInXTSMode extends SaltedCollateCipher {
   @override
-  String get name => "AES/XTS";
+  String get name => "AES/XTS/${Padding.none.name}";
 
   @override
   final AESInXTSModeEncrypt encryptor;

lib/src/algorithms/chacha20.dart

@@ -19,8 +19,11 @@ class ChaCha20Sink extends CipherSink {
     if (_nonce.length != 8 && _nonce.length != 12) {
       throw ArgumentError('The nonce should be either 8 or 12 bytes');
     }
-    if (_counter.length != 4 && _counter.length != 8) {
-      throw ArgumentError('The counter should be either 4 or 8 bytes');
+    if (_nonce.length == 8 && _counter.length < 8) {
+      throw ArgumentError('The counter should be 8 bytes');
+    }
+    if (_nonce.length == 12 && _counter.length < 4) {
+      throw ArgumentError('The counter should be 4 bytes');
     }
     _counterSize = _nonce.length == 8 ? 8 : 4;
     reset();
@@ -257,9 +260,10 @@ class ChaCha20 extends SaltedCipher {
   }) {
     nonce ??= randomBytes(8);
     counter ??= Nonce64.int64(1);
+    var counter8 = counter.bytes;
     var key8 = key is Uint8List ? key : Uint8List.fromList(key);
     var nonce8 = nonce is Uint8List ? nonce : Uint8List.fromList(nonce);
-    return ChaCha20(key8, nonce8, counter.bytes);
+    return ChaCha20(key8, nonce8, counter8);
   }
 
   @override

lib/src/algorithms/padding.dart

@@ -209,7 +209,7 @@ class _BytePadding extends Padding {
 
 class _ANSIPadding extends Padding {
   @override
-  final String name = "ANSI-X9.23";
+  final String name = "ANSI";
 
   const _ANSIPadding();
 
@@ -248,7 +248,7 @@ class _ANSIPadding extends Padding {
 
 class _PKCS7Padding extends Padding {
   @override
-  final String name = "PKCS#7";
+  final String name = "PKCS7";
 
   const _PKCS7Padding();
 
@@ -286,7 +286,7 @@ class _PKCS7Padding extends Padding {
 
 class _PKCS5Padding extends Padding {
   @override
-  final String name = "PKCS#5";
+  final String name = "PKCS5";
 
   const _PKCS5Padding();
 

lib/src/algorithms/salsa20.dart

@@ -5,28 +5,35 @@ import 'dart:typed_data';
 
 import 'package:cipherlib/src/core/cipher_sink.dart';
 import 'package:cipherlib/src/core/salted_cipher.dart';
+import 'package:cipherlib/src/utils/nonce.dart';
+import 'package:hashlib/hashlib.dart' show randomBytes;
 
 const int _mask32 = 0xFFFFFFFF;
 
 /// This sink is used by the [Salsa20] algorithm.
 class Salsa20Sink extends CipherSink {
-  Salsa20Sink(this._key, this._iv, this._counterStart) {
+  Salsa20Sink(this._key, this._nonce, this._counter) {
     if (_key.length != 16 && _key.length != 32) {
       throw ArgumentError('The key should be either 16 or 32 bytes');
     }
-    if (_iv.length != 8 && _iv.length != 16) {
+    if (_nonce.length != 8 && _nonce.length != 16) {
       throw ArgumentError('The nonce should be either 8 or 16 bytes');
     }
+    _needCounter = _nonce.length == 8;
+    if (_needCounter && _counter.length < 8) {
+      throw ArgumentError('The counter should be 8 bytes');
+    }
     reset();
   }
 
   int _pos = 0;
-  int _counter = 0;
   bool _closed = false;
   final Uint8List _key;
-  final Uint8List _iv;
-  final int _counterStart;
+  final Uint8List _nonce;
+  final Uint8List _counter;
+  final _iv = Uint8List(16);
   final _state = Uint32List(16);
+  late final bool _needCounter;
   late final _state8 = _state.buffer.asUint8List();
   late final _key32 = _key.buffer.asUint32List();
   late final _iv32 = _iv.buffer.asUint32List();
@@ -38,8 +45,16 @@ class Salsa20Sink extends CipherSink {
   void reset() {
     _pos = 0;
     _closed = false;
-    _counter = _counterStart;
-    _block(_state, _key32, _iv32, _counter++);
+    for (int i = 0; i < _nonce.length; ++i) {
+      _iv[i] = _nonce[i];
+    }
+    if (_needCounter) {
+      for (int i = 8; i < 16; ++i) {
+        _iv[i] = _counter[i - 8];
+      }
+    }
+    _block(_state, _key32, _iv32);
+    _increment();
   }
 
   @override
@@ -58,19 +73,28 @@ class Salsa20Sink extends CipherSink {
     var result = Uint8List(end - start);
     for (int i = start; i < end; i++) {
       if (_pos == 64) {
-        _block(_state, _key32, _iv32, _counter++);
+        _block(_state, _key32, _iv32);
+        _increment();
         _pos = 0;
       }
       result[i] = data[i] ^ _state8[_pos++];
     }
     return result;
   }
 
+  void _increment() {
+    if (_needCounter) {
+      for (int i = 8; i < 16; ++i) {
+        if ((++_iv[i]) != 0) return;
+      }
+    }
+  }
+
   @pragma('vm:prefer-inline')
   static int _rotl32(int x, int n) =>
       (((x << n) & _mask32) ^ ((x & _mask32) >>> (32 - n)));
 
-  static void _block(Uint32List B, Uint32List K, Uint32List N, int counter) {
+  static void _block(Uint32List B, Uint32List K, Uint32List N) {
     int i, s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
 
     // init state
@@ -81,7 +105,6 @@ class Salsa20Sink extends CipherSink {
       s3 = B[3] = K[2];
       s4 = B[4] = K[3];
       s5 = B[5] = 0x3120646e; // 'nd 1'
-      // 6..9 : nonce
       s10 = B[10] = 0x79622d36; // '6-by'
       s11 = B[11] = K[0];
       s12 = B[12] = K[1];
@@ -95,26 +118,17 @@ class Salsa20Sink extends CipherSink {
       s3 = B[3] = K[2];
       s4 = B[4] = K[3];
       s5 = B[5] = 0x3320646e; // 'nd 3'
-      // 6..9 : nonce
       s10 = B[10] = 0x79622d32; // '2-by'
       s11 = B[11] = K[4];
       s12 = B[12] = K[5];
       s13 = B[13] = K[6];
       s14 = B[14] = K[7];
       s15 = B[15] = 0x6b206574; // 'te k'
     }
-    // 6..9 : nonce
-    if (N.lengthInBytes == 8) {
-      s6 = B[6] = N[0];
-      s7 = B[7] = N[1];
-      s8 = B[8] = counter;
-      s9 = B[9] = counter >>> 32;
-    } else {
-      s6 = B[6] = N[0];
-      s7 = B[7] = N[1];
-      s8 = B[8] = N[2];
-      s9 = B[9] = N[3];
-    }
+    s6 = B[6] = N[0];
+    s7 = B[7] = N[1];
+    s8 = B[8] = N[2];
+    s9 = B[9] = N[3];
 
     // 10 row(column) rounds
     for (i = 0; i < 10; i++) {
@@ -197,27 +211,29 @@ class Salsa20 extends SaltedCipher {
   final Uint8List key;
 
   /// The initial block id
-  final int counter;
+  final Uint8List counter;
 
   const Salsa20(
     this.key,
-    Uint8List iv, [
-    this.counter = 0,
-  ]) : super(iv);
+    Uint8List nonce,
+    this.counter,
+  ) : super(nonce);
 
   /// Creates a [Salsa20] with List<int> [key], and [nonce].
   ///
   /// Every elements of the both list is transformed to unsigned 8-bit numbers.
   factory Salsa20.fromList(
-    List<int> key,
-    List<int> nonce, [
-    int counter = 0,
-  ]) =>
-      Salsa20(
-        key is Uint8List ? key : Uint8List.fromList(key),
-        nonce is Uint8List ? nonce : Uint8List.fromList(nonce),
-        counter,
-      );
+    List<int> key, {
+    List<int>? nonce,
+    Nonce64? counter,
+  }) {
+    nonce ??= randomBytes(16);
+    counter ??= Nonce64.zero();
+    var counter8 = counter.bytes;
+    var key8 = key is Uint8List ? key : Uint8List.fromList(key);
+    var nonce8 = nonce is Uint8List ? nonce : Uint8List.fromList(nonce);
+    return Salsa20(key8, nonce8, counter8);
+  }
 
   @override
   @pragma('vm:prefer-inline')