build: pin encrypt package to 5.0.2

fix: where we were using encrypt package's IV.fromLength(16) to generate empty IVs, we now need to use IV(Uint8List(16)) as encrypt package 5.0.2 has changed the behaviour of IV.fromLength build: temporarily change the git branch from which we are cloning `at_tools` to `gkc/work-around-encrypt-package-breaking-change` rather than trunk so can verify changes that have been made there before merging that PR
atsign-foundation · Sep 15, 2023 · ac6b0c2 · ac6b0c2
1 parent fead07d
commit ac6b0c2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/at_server.yaml b/.github/workflows/at_server.yaml
@@ -413,7 +413,7 @@ jobs:
         with:
           repository: atsign-foundation/at_tools
           path: at_tools
-          ref: trunk
+          ref: gkc/work-around-encrypt-package-breaking-change
 
       - name: Fetch Cram Keys
         id: cram_keys

diff --git a/packages/at_secondary_server/pubspec.yaml b/packages/at_secondary_server/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
   collection: 1.18.0
   basic_utils: 5.6.1
   ecdsa: 0.0.4
-  encrypt: 5.0.1
+  encrypt: 5.0.2
   at_commons: 3.0.55
   at_utils: 3.0.15
   at_chops: 1.0.4

diff --git a/packages/at_secondary_server/test/keys_verb_test.dart b/packages/at_secondary_server/test/keys_verb_test.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:typed_data';
 
 import 'package:at_commons/at_commons.dart';
 import 'package:at_persistence_secondary_server/at_persistence_secondary_server.dart';
@@ -730,7 +731,7 @@ void main() {
       var apkamSymmetricKeyEncrypter = Encrypter(AES(Key.fromSecureRandom(32)));
 
       var encryptedDefaultEncryptionPrivateKey = apkamSymmetricKeyEncrypter
-          .encrypt(encryptionPrivateKey, iv: IV.fromLength(16))
+          .encrypt(encryptionPrivateKey, iv: IV(Uint8List(16)))
           .base64;
       var valueJson = {};
       valueJson['value'] = encryptedDefaultEncryptionPrivateKey;

diff --git a/tests/at_functional_test/test/encryption_util.dart b/tests/at_functional_test/test/encryption_util.dart
@@ -1,12 +1,14 @@
 
+import 'dart:typed_data';
+
 import 'package:crypton/crypton.dart';
 import 'package:encrypt/encrypt.dart';
 
 class EncryptionUtil {
 
   static IV getIV(String? ivBase64) {
     if (ivBase64 == null) {
-      return IV.fromLength(16);
+      return IV(Uint8List(16));
     } else {
       return IV.fromBase64(ivBase64);
     }

diff --git a/tests/at_functional_test/test/keys_verb_test.dart b/tests/at_functional_test/test/keys_verb_test.dart
@@ -2,6 +2,7 @@
 
 import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 
 import 'package:at_demo_data/at_demo_data.dart';
 import 'package:at_demo_data/at_demo_data.dart' as at_demos;
@@ -102,7 +103,7 @@ void main() {
       //3. put encryption private key which is encrypted with self symmetric key
       var rsaPrivateKey = encryptionPrivateKeyMap[firstAtsign];
       var encryptedPrivateKey = Encrypter(AES(Key.fromBase64(aesKey)))
-          .encrypt(rsaPrivateKey!, iv: IV.fromLength(16))
+          .encrypt(rsaPrivateKey!, iv: IV(Uint8List(16)))
           .base64;
       var privateKeyCommand =
           'keys:put:private:namespace:__global:appName:wavi:deviceName:pixel:keyType:aes:encryptionKeyName:myAESkey:keyName:myPrivateKey $encryptedPrivateKey';
@@ -276,7 +277,7 @@ void main() {
       //3. put encryption private key which is encrypted with self symmetric key
       var rsaPrivateKey = encryptionPrivateKeyMap[firstAtsign];
       var encryptedPrivateKey = Encrypter(AES(Key.fromBase64(aesKey)))
-          .encrypt(rsaPrivateKey!, iv: IV.fromLength(16))
+          .encrypt(rsaPrivateKey!, iv: IV(Uint8List(16)))
           .base64;
       var privateKeyCommand =
           'keys:put:private:namespace:__global:appName:wavi:deviceName:pixel:keyType:aes:encryptionKeyName:myAESkey:keyName:myPrivateKey $encryptedPrivateKey';