Merge pull request #159 from terrier989/master

Raises Dart SDK version minimum to 3.1.0 and other changes

Author: terrier989

cryptography/README.md

@@ -27,14 +27,14 @@ Any feedback, issue reports, or pull requests are appreciated!
 # Getting started
 
 If you use Flutter, it's recommended (but not necessarily) that you also import our sibling package
-[cryptography_flutter](https://pub.dev/packages/cryptography_flutter), which improves performance
-by using operating system APIs.
+[cryptography_flutter](https://pub.dev/packages/cryptography_flutter), which delegates calls to
+Android / iOS / Mac OS X operating system APIs whenever possible.
 
 In _pubspec.yaml_:
 ```yaml
 dependencies:
-  cryptography: ^2.5.0
-  cryptography_flutter: ^2.3.0 # Remove if you don't use Flutter
+  cryptography: ^2.5.1
+  cryptography_flutter: ^2.3.1 # Remove if you don't use Flutter
 ```
 
 You are ready to go!
@@ -207,7 +207,8 @@ faster because this package automatically uses Web Crypto API.
 
 ## Random number generators
 
-We continue to use the old good `Random.secure()` as the default random number in all APIs.
+We use Dart SDK [Random.secure()](https://api.dart.dev/stable/3.1.0/dart-math/Random/Random.secure.html)
+as the default random number in all APIs.
 
 If you do want much faster cryptographically reasonably strong random numbers, this package contains
 [SecureRandom.fast](https://pub.dev/documentation/cryptography/latest/cryptography/SecureRandom/fast.html).
@@ -353,17 +354,14 @@ authentication code).
 When you decrypt, you need the _SecretBox_ and the secret key.
 
 In the following example, we encrypt a message
-with [AesCtr](https://pub.dev/documentation/cryptography/latest/cryptography/AesCtr-class.html)
-and a [Hmac](https://pub.dev/documentation/cryptography/latest/cryptography/Hmac-class.html) message
-authentication code that uses [Sha256](https://pub.dev/documentation/cryptography/latest/cryptography/Sha256-class.html)
-hash algorithm:
+with [AesGcm](https://pub.dev/documentation/cryptography/latest/cryptography/AesGcm-class.html):
 ```dart
 import 'dart:convert';
 import 'package:cryptography/cryptography.dart';
 
 Future<void> main() async {
   // Choose the cipher
-  final algorithm = AesCtr(macAlgorithm: Hmac.sha256());
+  final algorithm = AesGcm.with256bits();
 
   // Generate a random secret key.
   final secretKey = await algorithm.newSecretKey();

cryptography/lib/src/cryptography/cipher.dart

@@ -399,17 +399,16 @@ abstract class Cipher {
     String clearText, {
     required SecretKey secretKey,
   }) async {
-    final bytes = utf8.encode(clearText);
+    final bytes = utf8.encode(clearText) as Uint8List;
     final secretBox = await encrypt(
       bytes,
       secretKey: secretKey,
-      possibleBuffer: bytes is Uint8List ? bytes : null,
+      possibleBuffer: bytes,
     );
 
     // Overwrite `bytes` if it was not overwritten by the cipher.
     final cipherText = secretBox.cipherText;
-    if (bytes is! Uint8List ||
-        cipherText is! Uint8List ||
+    if (cipherText is! Uint8List ||
         !identical(bytes.buffer, cipherText.buffer)) {
       bytes.fillRange(0, bytes.length, 0);
     }

cryptography/lib/src/cryptography/cipher_wand.dart

@@ -175,17 +175,16 @@ abstract class CipherWand extends Wand {
   /// }
   /// ```
   Future<SecretBox> encryptString(String clearText) async {
-    final bytes = utf8.encode(clearText);
+    final bytes = utf8.encode(clearText) as Uint8List;
     final secretBox = await encrypt(
       bytes,
-      possibleBuffer: bytes is Uint8List ? bytes : null,
+      possibleBuffer: bytes,
     );
 
     // Cut the amount of possibly sensitive data in the heap.
     // This should be a cheap operation relative to encryption.
     final cipherText = secretBox.cipherText;
-    if (bytes is! Uint8List ||
-        cipherText is! Uint8List ||
+    if (cipherText is! Uint8List ||
         !identical(bytes.buffer, cipherText.buffer)) {
       bytes.fillRange(0, bytes.length, 0);
     }

cryptography/lib/src/cryptography/mac_algorithm.dart

@@ -21,16 +21,28 @@ import 'package:cryptography/dart.dart';
 
 /// A Message Authentication Code (MAC) algorithm.
 ///
+/// You can compute a [Mac] by calling [calculateMac] or [newMacSink].
+///
 /// ## Available algorithms
 ///   * [Hmac]
-///   * [MacAlgorithm.empty]
 ///   * [Poly1305]
+///
+/// ## Not using MAC?
+///
+/// If are sure you don't need a MAC, you can use [MacAlgorithm.empty]:
+/// ```
+/// final example = ChaCha20(macAlgorithm: MacAlgorithm.empty);
+/// ```
 abstract class MacAlgorithm {
   /// MAC algorithm that always returns [Mac.empty].
   static const MacAlgorithm empty = _EmptyMacAlgorithm();
 
   const MacAlgorithm();
 
+  /// Number of bytes in key stream used to initialize the MAC algorithm.
+  ///
+  /// In [Chacha20.poly1305Aead], the first block of the ChaCha20 stream is used
+  /// as the Poly1305 key (thus [keyStreamUsed] is 64).
   int get keyStreamUsed => 0;
 
   /// Number of bytes in the message authentication code.
@@ -39,6 +51,7 @@ abstract class MacAlgorithm {
   /// Whether the algorithm supports Associated Authenticated Data (AAD).
   bool get supportsAad => false;
 
+  /// Whether the algorithm supports key stream index.
   bool get supportsKeyStreamIndex => keyStreamUsed == 0;
 
   /// Calculates message authentication code.

cryptography/lib/src/dart/_helpers.dart

@@ -29,7 +29,7 @@ void checkSystemIsLittleEndian() {
 }
 
 /// A helper for using "package:crypto" hash algorithms.
-class PackageCryptoDigestCaptureSink extends Sink<other.Digest> {
+class PackageCryptoDigestCaptureSink implements Sink<other.Digest> {
   Hash? _result;
 
   PackageCryptoDigestCaptureSink();

cryptography/pubspec.yaml

@@ -1,26 +1,26 @@
 name: cryptography
-version: 2.5.0
+version: 2.5.1
 homepage: https://github.com/dint-dev/cryptography
 description:
   Cryptographic algorithms for encryption, digital signatures, key agreement, authentication, and
   hashing. AES, Chacha20, ED25519, X25519, and more. Good cross-platform support.
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=3.1.0 <4.0.0'
 
 dependencies:
   #
-  # Packages by the Google:
+  # Packages by Google:
   #
-  collection: ^1.16.0
-  crypto: ^3.0.0
-  js: ^0.6.2
-  meta: ^1.3.0
+  collection: ^1.17.0
+  crypto: ^3.0.3
+  js: ^0.6.7
+  meta: ^1.8.0
   typed_data: ^1.3.0
 
 dev_dependencies:
   #
-  # Packages by the Google:
+  # Packages by Google:
   #
-  lints: ^2.0.1
-  test: ^1.19.0
+  lints: ^2.1.1
+  test: ^1.24.0

cryptography/test/algorithms/pbkdf2_test.dart

@@ -47,7 +47,7 @@ void _main() {
   test('deriveKey(...): Hmac(sha256), 10k iterations in 300ms', () async {
     final macAlgorithm = Hmac.sha256();
     final n = 10 * 1000;
-    const maxDuration = Duration(milliseconds: 300);
+    const maxDuration = Duration(milliseconds: 1000);
 
     final pbkdf2 = Pbkdf2(
       macAlgorithm: macAlgorithm,

cryptography/test/algorithms/poly1305_test.dart

@@ -27,7 +27,7 @@ void main() {
         ..[0] = 1
         ..[2] = 2;
       var k = SecretKey(secretKeyBytes);
-      var state = utf8.encode('Hello world');
+      List<int> state = utf8.encode('Hello world');
       for (var i = 0; i < 100000; i++) {
         final mac = await algorithm.calculateMac(
           state,

cryptography_flutter/README.md

@@ -49,8 +49,8 @@ In _pubspec.yaml_:
 
 ```yaml
 dependencies:
-  cryptography: ^2.5.0
-  cryptography_flutter: ^2.3.0
+  cryptography: ^2.5.1
+  cryptography_flutter: ^2.3.1
 ```
 
 That's it!

cryptography_flutter/example/ios/Podfile.lock

@@ -0,0 +1,22 @@
+PODS:
+  - cryptography_flutter (0.2.0):
+    - Flutter
+  - Flutter (1.0.0)
+
+DEPENDENCIES:
+  - cryptography_flutter (from `.symlinks/plugins/cryptography_flutter/ios`)
+  - Flutter (from `Flutter`)
+
+EXTERNAL SOURCES:
+  cryptography_flutter:
+    :path: ".symlinks/plugins/cryptography_flutter/ios"
+  Flutter:
+    :path: Flutter
+
+SPEC CHECKSUMS:
+  cryptography_flutter: 381bdacc984abcfbe3ca45ef7c76566ff061614c
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
+
+COCOAPODS: 1.11.2