WIP

Signed-off-by: Nguyen Van Nguyen <[email protected]>
web-of-trust · Dec 11, 2024 · 82cd02b · 82cd02b
1 parent ee80899
commit 82cd02b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/lib/src/enum/symmetric_algorithm.dart b/lib/src/enum/symmetric_algorithm.dart
@@ -30,6 +30,17 @@ enum SymmetricAlgorithm {
 
   const SymmetricAlgorithm(this.value);
 
+  static List<SymmetricAlgorithm> get preferredSymmetrics => [
+        aes128,
+        aes192,
+        aes256,
+        camellia128,
+        camellia192,
+        camellia256,
+        blowfish,
+        twofish,
+      ];
+
   int get keySize => switch (this) {
         plaintext => 0,
         idea || cast5 || blowfish || aes128 || camellia128 => 128,

diff --git a/lib/src/message/literal_message.dart b/lib/src/message/literal_message.dart
@@ -60,29 +60,25 @@ final class LiteralMessage extends BaseMessage implements LiteralMessageInterfac
     final Iterable<KeyInterface> encryptionKeys, [
     final SymmetricAlgorithm defaultSymmetric = SymmetricAlgorithm.aes128,
   ]) {
-    var desiredSymmetrics = [
-      SymmetricAlgorithm.aes128,
-      SymmetricAlgorithm.aes192,
-      SymmetricAlgorithm.aes256,
-    ];
+    var preferredSymmetrics = SymmetricAlgorithm.preferredSymmetrics;
     for (final key in encryptionKeys) {
-      desiredSymmetrics = desiredSymmetrics
+      preferredSymmetrics = preferredSymmetrics
           .where(
             (symmetric) => key.preferredSymmetrics.contains(symmetric),
           )
           .toList();
     }
-    final symmetric = desiredSymmetrics.firstOrNull ?? defaultSymmetric;
+    final symmetric = preferredSymmetrics.firstOrNull ?? defaultSymmetric;
 
-    var desiredAeads = [
+    var preferredAeads = [
       AeadAlgorithm.ocb,
       AeadAlgorithm.gcm,
       AeadAlgorithm.eax,
     ];
     var aeadProtect = Config.aeadProtect;
     for (final key in encryptionKeys) {
       if (key.aeadSupported) {
-        desiredAeads = desiredAeads
+        preferredAeads = preferredAeads
             .where(
               (aead) => key.preferredAeads(symmetric).contains(aead),
             )
@@ -92,7 +88,7 @@ final class LiteralMessage extends BaseMessage implements LiteralMessageInterfac
         break;
       }
     }
-    final aead = desiredAeads.firstOrNull ?? Config.preferredAead;
+    final aead = preferredAeads.firstOrNull ?? Config.preferredAead;
 
     return SessionKey.produceKey(
       symmetric,