apply dartfmt
diff --git a/lib/block/modes/ccm.dart b/lib/block/modes/ccm.dart
index 28931f2..6db70eb 100644
--- a/lib/block/modes/ccm.dart
+++ b/lib/block/modes/ccm.dart
@@ -87,7 +87,8 @@
String get algorithmName => '${underlyingCipher.algorithmName}/CCM';
@override
- int processBytes(Uint8List inp, int inpOff, int len, Uint8List out, int outOff) {
+ int processBytes(
+ Uint8List inp, int inpOff, int len, Uint8List out, int outOff) {
data.write(inp, inpOff, len);
return 0;
}
@@ -107,7 +108,8 @@
}
@override
- int processBlock(Uint8List inp, int inpOff, Uint8List out, int outOff) => processBytes(inp, inpOff, inp.length, out, outOff);
+ int processBlock(Uint8List inp, int inpOff, Uint8List out, int outOff) =>
+ processBytes(inp, inpOff, inp.length, out, outOff);
int _processPacket(
Uint8List inp, int inpOff, int len, Uint8List out, int outOff) {
@@ -287,11 +289,13 @@
return cMac.doFinal(macBlock, 0);
}
- int _getMacSize(bool forEncryption, int requestedMacBits)
- {
- if (forEncryption && (requestedMacBits < 32 || requestedMacBits > 128 || 0 != (requestedMacBits & 15)))
- {
- throw ArgumentError('tag length in octets must be one of {4,6,8,10,12,14,16}');
+ int _getMacSize(bool forEncryption, int requestedMacBits) {
+ if (forEncryption &&
+ (requestedMacBits < 32 ||
+ requestedMacBits > 128 ||
+ 0 != (requestedMacBits & 15))) {
+ throw ArgumentError(
+ 'tag length in octets must be one of {4,6,8,10,12,14,16}');
}
return cshiftr32(requestedMacBits, 3);
@@ -336,7 +340,7 @@
}
extension WriteLen on BytesBuilder {
- void write (Uint8List b, int off, int len) {
+ void write(Uint8List b, int off, int len) {
add(b.sublist(off, off + len));
}
}
diff --git a/lib/key_derivators/api.dart b/lib/key_derivators/api.dart
index ab74edf..15af5c5 100644
--- a/lib/key_derivators/api.dart
+++ b/lib/key_derivators/api.dart
@@ -82,21 +82,20 @@
final int version;
-
Argon2Parameters(
- this.type,
- this._salt, {
- required this.desiredKeyLength,
- Uint8List? secret,
- Uint8List? additional,
- this.iterations = DEFAULT_ITERATIONS,
- int? memoryPowerOf2,
- int? memory,
- this.lanes = DEFAULT_LANES,
- this.version = DEFAULT_VERSION,
- }) : memory = memoryPowerOf2 != null
- ? 1 << memoryPowerOf2
- : (memory ?? (1 << DEFAULT_MEMORY_COST)),
+ this.type,
+ this._salt, {
+ required this.desiredKeyLength,
+ Uint8List? secret,
+ Uint8List? additional,
+ this.iterations = DEFAULT_ITERATIONS,
+ int? memoryPowerOf2,
+ int? memory,
+ this.lanes = DEFAULT_LANES,
+ this.version = DEFAULT_VERSION,
+ }) : memory = memoryPowerOf2 != null
+ ? 1 << memoryPowerOf2
+ : (memory ?? (1 << DEFAULT_MEMORY_COST)),
_secret = secret,
_additional = additional;
@@ -117,4 +116,3 @@
return 'Argon2Parameters{ type: $type, iterations: $iterations, memory: $memory, lanes: $lanes, version: $version }';
}
}
-
diff --git a/lib/key_derivators/hkdf.dart b/lib/key_derivators/hkdf.dart
index cd707a8..e5da676 100644
--- a/lib/key_derivators/hkdf.dart
+++ b/lib/key_derivators/hkdf.dart
@@ -92,7 +92,7 @@
return _generate(out, outOff, keySize);
}
- Uint8List combineLists (Uint8List a, Uint8List b) {
+ Uint8List combineLists(Uint8List a, Uint8List b) {
var length = a.length + b.length;
var holder = Uint8List(length);
holder.setRange(0, a.length, a);
diff --git a/test/asn1/asn1_parser_test.dart b/test/asn1/asn1_parser_test.dart
index 3da0a79..c027de2 100644
--- a/test/asn1/asn1_parser_test.dart
+++ b/test/asn1/asn1_parser_test.dart
@@ -14,7 +14,6 @@
import 'package:test/test.dart';
void main() {
-
///
/// Test simple structur
///
@@ -309,7 +308,7 @@
var asn1Object = e1.elements!.elementAt(0);
var integer1 =
- ASN1Parser(asn1Object.valueBytes).nextObject() as ASN1Integer;
+ ASN1Parser(asn1Object.valueBytes).nextObject() as ASN1Integer;
expect(integer1.totalEncodedByteLength, 3);
expect(integer1.valueByteLength, 1);
diff --git a/test/asymmetric/oaep_test.dart b/test/asymmetric/oaep_test.dart
index f64d94e..336efa5 100644
--- a/test/asymmetric/oaep_test.dart
+++ b/test/asymmetric/oaep_test.dart
@@ -743,4 +743,3 @@
_next = 0;
}
}
-
diff --git a/test/key_derivators/argon2_test.dart b/test/key_derivators/argon2_test.dart
index 3a0b625..b7b9aca 100644
--- a/test/key_derivators/argon2_test.dart
+++ b/test/key_derivators/argon2_test.dart
@@ -125,4 +125,4 @@
// Should be able to re-use generator after successful use
result = gen.process(passwordBytes);
expect(result, createUint8ListFromHexString(passwordRef));
-}
\ No newline at end of file
+}
diff --git a/test/key_derivators/hkdf_test.dart b/test/key_derivators/hkdf_test.dart
index ac61120..2df2d77 100644
--- a/test/key_derivators/hkdf_test.dart
+++ b/test/key_derivators/hkdf_test.dart
@@ -54,23 +54,23 @@
test('Test Case 2 - Test with SHA-256 and longer inputs/outputs', () {
var ikm =
- createUint8ListFromHexString('000102030405060708090a0b0c0d0e0f'
- '101112131415161718191a1b1c1d1e1f'
- '202122232425262728292a2b2c2d2e2f'
- '303132333435363738393a3b3c3d3e3f'
- '404142434445464748494a4b4c4d4e4f');
+ createUint8ListFromHexString('000102030405060708090a0b0c0d0e0f'
+ '101112131415161718191a1b1c1d1e1f'
+ '202122232425262728292a2b2c2d2e2f'
+ '303132333435363738393a3b3c3d3e3f'
+ '404142434445464748494a4b4c4d4e4f');
var salt =
- createUint8ListFromHexString('606162636465666768696a6b6c6d6e6f'
- '707172737475767778797a7b7c7d7e7f'
- '808182838485868788898a8b8c8d8e8f'
- '909192939495969798999a9b9c9d9e9f'
- 'a0a1a2a3a4a5a6a7a8a9aaabacadaeaf');
+ createUint8ListFromHexString('606162636465666768696a6b6c6d6e6f'
+ '707172737475767778797a7b7c7d7e7f'
+ '808182838485868788898a8b8c8d8e8f'
+ '909192939495969798999a9b9c9d9e9f'
+ 'a0a1a2a3a4a5a6a7a8a9aaabacadaeaf');
var info =
- createUint8ListFromHexString('b0b1b2b3b4b5b6b7b8b9babbbcbdbebf'
- 'c0c1c2c3c4c5c6c7c8c9cacbcccdcecf'
- 'd0d1d2d3d4d5d6d7d8d9dadbdcdddedf'
- 'e0e1e2e3e4e5e6e7e8e9eaebecedeeef'
- 'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff');
+ createUint8ListFromHexString('b0b1b2b3b4b5b6b7b8b9babbbcbdbebf'
+ 'c0c1c2c3c4c5c6c7c8c9cacbcccdcecf'
+ 'd0d1d2d3d4d5d6d7d8d9dadbdcdddedf'
+ 'e0e1e2e3e4e5e6e7e8e9eaebecedeeef'
+ 'f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff');
var l = 82;
var okm = Uint8List(l);
@@ -178,47 +178,47 @@
// this test is identical to test 6 in all ways bar the IKM value
test('Test Case 7 - Test with SHA-1, salt not provided, zero-length info',
- () {
- var ikm = createUint8ListFromHexString(
- '0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c');
- var info = Uint8List(0);
- var l = 42;
- var okm = Uint8List(l);
+ () {
+ var ikm = createUint8ListFromHexString(
+ '0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c');
+ var info = Uint8List(0);
+ var l = 42;
+ var okm = Uint8List(l);
- var params = HkdfParameters(ikm, l, null, info);
+ var params = HkdfParameters(ikm, l, null, info);
- var hkdf = HKDFKeyDerivator(SHA1Digest());
- hkdf.init(params);
- hkdf.deriveKey(null, 0, okm, 0);
+ var hkdf = HKDFKeyDerivator(SHA1Digest());
+ hkdf.init(params);
+ hkdf.deriveKey(null, 0, okm, 0);
- var actual = formatBytesAsHexString(okm);
- var expected =
- '2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48';
- expect(actual, equals(expected));
- });
+ var actual = formatBytesAsHexString(okm);
+ var expected =
+ '2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48';
+ expect(actual, equals(expected));
+ });
// this test is identical to test 7 in all ways bar the IKM value
// which is set to the PRK value
test(
'Additional Test Case - Test with SHA-1, skipping extract zero-length info',
- () {
- var ikm = createUint8ListFromHexString(
- '2adccada18779e7c2077ad2eb19d3f3e731385dd');
- var info = Uint8List(0);
- var l = 42;
- var okm = Uint8List(l);
+ () {
+ var ikm = createUint8ListFromHexString(
+ '2adccada18779e7c2077ad2eb19d3f3e731385dd');
+ var info = Uint8List(0);
+ var l = 42;
+ var okm = Uint8List(l);
- var params = HkdfParameters(ikm, l, null, info, true);
+ var params = HkdfParameters(ikm, l, null, info, true);
- var hkdf = HKDFKeyDerivator(SHA1Digest());
- hkdf.init(params);
- hkdf.deriveKey(null, 0, okm, 0);
+ var hkdf = HKDFKeyDerivator(SHA1Digest());
+ hkdf.init(params);
+ hkdf.deriveKey(null, 0, okm, 0);
- var actual = formatBytesAsHexString(okm);
- var expected =
- '2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48';
- expect(actual, equals(expected));
- });
+ var actual = formatBytesAsHexString(okm);
+ var expected =
+ '2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48';
+ expect(actual, equals(expected));
+ });
// this test is identical to test 7 in all ways bar the IKM value
test('Additional Test Case - Test with SHA-1, maximum output', () {
@@ -248,4 +248,4 @@
});
});
});
-}
\ No newline at end of file
+}
diff --git a/test/macs/hmac_test.dart b/test/macs/hmac_test.dart
index 424a802..ce12a6a 100644
--- a/test/macs/hmac_test.dart
+++ b/test/macs/hmac_test.dart
@@ -222,4 +222,3 @@
'134676fb6de0446065c97440fa8c6a58')
]);
}
-
diff --git a/test/modes/ccm_test.dart b/test/modes/ccm_test.dart
index 5ec4471..6a11b20 100644
--- a/test/modes/ccm_test.dart
+++ b/test/modes/ccm_test.dart
@@ -37,9 +37,11 @@
'name': 'Test Case 3',
'key': createUint8ListFromHexString('404142434445464748494a4b4c4d4e4f'),
'iv': createUint8ListFromHexString('101112131415161718191a1b'),
- 'aad': createUint8ListFromHexString('000102030405060708090a0b0c0d0e0f10111213'),
+ 'aad': createUint8ListFromHexString(
+ '000102030405060708090a0b0c0d0e0f10111213'),
'input': '202122232425262728292a2b2c2d2e2f3031323334353637',
- 'output': 'e3b201a9f5b71a7a9b1ceaeccd97e70b6176aad9a4428aa5484392fbc1b09951',
+ 'output':
+ 'e3b201a9f5b71a7a9b1ceaeccd97e70b6176aad9a4428aa5484392fbc1b09951',
'mac': createUint8ListFromHexString('67c99240c7d51048'),
'tl': 64
},
@@ -49,14 +51,20 @@
for (var map in paramList) {
test(map['name'], () {
var encrypter = CCMBlockCipher(AESFastEngine());
- var params = AEADParameters(KeyParameter((map['key'] as Uint8List)),
- map['tl'] as int, (map['iv'] as Uint8List), (map['aad'] as Uint8List));
+ var params = AEADParameters(
+ KeyParameter((map['key'] as Uint8List)),
+ map['tl'] as int,
+ (map['iv'] as Uint8List),
+ (map['aad'] as Uint8List));
encrypter.init(true, params);
var result = encrypter
.process(createUint8ListFromHexString(map['input'] as String));
- expect(result, orderedEquals(createUint8ListFromHexString(map['output'] as String)));
+ expect(
+ result,
+ orderedEquals(
+ createUint8ListFromHexString(map['output'] as String)));
expect(encrypter.mac, orderedEquals(map['mac'] as Uint8List));
var decrypter = CCMBlockCipher(AESFastEngine())..init(false, params);
@@ -65,4 +73,4 @@
});
}
});
-}
\ No newline at end of file
+}
diff --git a/test/modes/ige_test.dart b/test/modes/ige_test.dart
index c553b93..e552d8a 100644
--- a/test/modes/ige_test.dart
+++ b/test/modes/ige_test.dart
@@ -8,33 +8,31 @@
import '../test/src/helpers.dart';
void main() {
- final key1 =
- createUint8ListFromHexString('000102030405060708090A0B0C0D0E0F'.toLowerCase());
+ final key1 = createUint8ListFromHexString(
+ '000102030405060708090A0B0C0D0E0F'.toLowerCase());
final iv1 = createUint8ListFromHexString(
- '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F'.toLowerCase());
+ '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F'
+ .toLowerCase());
final params1 = ParametersWithIV(KeyParameter(key1), iv1);
final data1 = String.fromCharCodes(createUint8ListFromHexString(
'0000000000000000000000000000000000000000000000000000000000000000'));
- final ct1 = '1A8519A6557BE652E9DA8E43DA4EF4453CF456B4CA488AA383C79C98B34797CB'.toLowerCase();
+ final ct1 = '1A8519A6557BE652E9DA8E43DA4EF4453CF456B4CA488AA383C79C98B34797CB'
+ .toLowerCase();
- runBlockCipherTests(BlockCipher('AES/IGE'), params1, [
- data1,
- ct1
- ]);
+ runBlockCipherTests(BlockCipher('AES/IGE'), params1, [data1, ct1]);
- final key2 =
- createUint8ListFromHexString('5468697320697320616E20696D706C65'.toLowerCase());
+ final key2 = createUint8ListFromHexString(
+ '5468697320697320616E20696D706C65'.toLowerCase());
final iv2 = createUint8ListFromHexString(
- '6D656E746174696F6E206F6620494745206D6F646520666F72204F70656E5353'.toLowerCase());
+ '6D656E746174696F6E206F6620494745206D6F646520666F72204F70656E5353'
+ .toLowerCase());
final params2 = ParametersWithIV(KeyParameter(key2), iv2);
final data2 = String.fromCharCodes(createUint8ListFromHexString(
'99706487A1CDE613BC6DE0B6F24B1C7AA448C8B9C3403E3467A8CAD89340F53B'));
- final ct2 = '4C2E204C6574277320686F70652042656E20676F74206974207269676874210A'.toLowerCase();
+ final ct2 = '4C2E204C6574277320686F70652042656E20676F74206974207269676874210A'
+ .toLowerCase();
- runBlockCipherTests(BlockCipher('AES/IGE'), params2, [
- data2,
- ct2
- ]);
+ runBlockCipherTests(BlockCipher('AES/IGE'), params2, [data2, ct2]);
}
diff --git a/test/test/runners/key_derivators.dart b/test/test/runners/key_derivators.dart
index 5c422c7..8d19b06 100644
--- a/test/test/runners/key_derivators.dart
+++ b/test/test/runners/key_derivators.dart
@@ -16,8 +16,10 @@
var password = paramsPasswordKeyTuples[i + 1];
var key = paramsPasswordKeyTuples[i + 2];
- test('${formatAsTruncated(password as String)}',
- () => _runKeyDerivatorTest(keyDerivator, params as CipherParameters, password, key as String));
+ test(
+ '${formatAsTruncated(password as String)}',
+ () => _runKeyDerivatorTest(keyDerivator, params as CipherParameters,
+ password, key as String));
}
});
});
@@ -32,4 +34,4 @@
var hexOut = formatBytesAsHexString(out);
expect(hexOut, equals(expectedHexKey));
-}
\ No newline at end of file
+}
