WIP

Signed-off-by: Nguyen Van Nguyen <[email protected]>
web-of-trust · Dec 20, 2024 · 7319b39 · 7319b39
1 parent 3dc51ba
commit 7319b39
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 37 deletions.
diff --git a/lib/src/common/config.dart b/lib/src/common/config.dart
@@ -29,7 +29,7 @@ final class Config {
 
   static HashAlgorithm preferredHash = HashAlgorithm.sha256;
 
-  static SymmetricAlgorithm preferredSymmetric = SymmetricAlgorithm.aes128;
+  static SymmetricAlgorithm preferredSymmetric = SymmetricAlgorithm.aes256;
 
   static CompressionAlgorithm preferredCompression =
       CompressionAlgorithm.uncompressed;

diff --git a/lib/src/cryptor/aead/eax.dart b/lib/src/cryptor/aead/eax.dart
@@ -5,7 +5,6 @@
 library;
 
 import 'dart:typed_data';
-
 import 'package:pointycastle/export.dart';
 
 import '../../enum/symmetric_algorithm.dart';

diff --git a/lib/src/cryptor/aead/gcm.dart b/lib/src/cryptor/aead/gcm.dart
@@ -5,7 +5,6 @@
 library;
 
 import 'dart:typed_data';
-
 import 'package:pointycastle/export.dart';
 
 import '../../enum/symmetric_algorithm.dart';

diff --git a/lib/src/cryptor/symmetric/buffered_cipher.dart b/lib/src/cryptor/symmetric/buffered_cipher.dart
@@ -5,7 +5,6 @@
 library;
 
 import 'dart:typed_data';
-
 import 'package:pointycastle/api.dart';
 
 /// Buffered cipher.

diff --git a/lib/src/cryptor/symmetric/camellia.dart b/lib/src/cryptor/symmetric/camellia.dart
@@ -7,8 +7,8 @@ library;
 import 'dart:typed_data';
 import 'package:pointycastle/api.dart';
 
-import 'base_engine.dart';
 import '../../common/extensions.dart';
+import 'base_engine.dart';
 
 /// Camellia - based on RFC 3713.
 /// Author Nguyen Van Nguyen <[email protected]>

diff --git a/lib/src/cryptor/symmetric/cast5.dart b/lib/src/cryptor/symmetric/cast5.dart
@@ -7,8 +7,8 @@ library;
 import 'dart:typed_data';
 import 'package:pointycastle/api.dart';
 
-import 'base_engine.dart';
 import '../../common/extensions.dart';
+import 'base_engine.dart';
 
 /// A class that provides CAST key encryption operations, such as encoding data and generating keys.
 /// All the algorithms herein are from the Internet RFC's

diff --git a/lib/src/cryptor/symmetric/idea.dart b/lib/src/cryptor/symmetric/idea.dart
@@ -7,8 +7,8 @@ library;
 import 'dart:typed_data';
 import 'package:pointycastle/api.dart';
 
-import 'base_engine.dart';
 import '../../common/extensions.dart';
+import 'base_engine.dart';
 
 /// A class that provides a basic International Data Encryption Algorithm (IDEA) engine.
 /// Author Nguyen Van Nguyen <[email protected]>

diff --git a/lib/src/cryptor/symmetric/twofish.dart b/lib/src/cryptor/symmetric/twofish.dart
@@ -7,8 +7,8 @@ library;
 import 'dart:typed_data';
 import 'package:pointycastle/api.dart';
 
-import 'base_engine.dart';
 import '../../common/extensions.dart';
+import 'base_engine.dart';
 
 /// A class that provides Twofish encryption operations.
 /// Author Nguyen Van Nguyen <[email protected]>

diff --git a/lib/src/enum/signature_type.dart b/lib/src/enum/signature_type.dart
@@ -6,14 +6,14 @@ library;
 
 export 'aead_algorithm.dart';
 export 'compression_algorithm.dart';
+export 'hash_algorithm.dart';
+export 'key_algorithm.dart';
 export 'key_flag.dart';
 export 'key_version.dart';
 export 'literal_format.dart';
+export 'signature_subpacket_type.dart';
 export 'support_feature.dart';
 export 'symmetric_algorithm.dart';
-export 'hash_algorithm.dart';
-export 'key_algorithm.dart';
-export 'signature_subpacket_type.dart';
 
 ///Signature types enum
 /// Author Nguyen Van Nguyen <[email protected]>

diff --git a/lib/src/message/cleartext_message.dart b/lib/src/message/cleartext_message.dart
@@ -5,13 +5,13 @@
 library;
 
 import '../common/helpers.dart';
-import '../message/signature.dart';
-import '../message/signed_message.dart';
 import '../packet/base_packet.dart';
 import '../type/cleartext_message.dart';
 import '../type/key.dart';
 import '../type/notation_data.dart';
 import '../type/signature.dart';
+import 'signature.dart';
+import 'signed_message.dart';
 
 /// Cleartext message class that represents an OpenPGP cleartext message.
 /// See RFC 9580, section 7.

diff --git a/lib/src/message/encrypted_message.dart b/lib/src/message/encrypted_message.dart
@@ -7,13 +7,13 @@ library;
 import '../common/armor.dart';
 import '../common/helpers.dart';
 import '../enum/armor_type.dart';
-import '../message/base_message.dart';
 import '../packet/base_packet.dart';
 import '../type/encrypted_data_packet.dart';
 import '../type/encrypted_message.dart';
 import '../type/packet_list.dart';
 import '../type/private_key.dart';
 import '../type/session_key.dart';
+import 'base_message.dart';
 
 /// OpenPGP encrypted message class
 /// Author Nguyen Van Nguyen <[email protected]>

diff --git a/lib/src/message/literal_message.dart b/lib/src/message/literal_message.dart
@@ -13,7 +13,6 @@ import '../enum/aead_algorithm.dart';
 import '../enum/armor_type.dart';
 import '../enum/compression_algorithm.dart';
 import '../enum/symmetric_algorithm.dart';
-import '../message/base_message.dart';
 import '../packet/base_packet.dart';
 import '../packet/key/session_key.dart';
 import '../type/key.dart';
@@ -22,6 +21,7 @@ import '../type/literal_message.dart';
 import '../type/packet_list.dart';
 import '../type/session_key.dart';
 import '../type/signature_packet.dart';
+import 'base_message.dart';
 
 /// OpenPGP literal message class
 /// Author Nguyen Van Nguyen <[email protected]>
@@ -59,7 +59,7 @@ final class LiteralMessage extends BaseMessage
   /// Taking the algorithm preferences of the passed encryption keys, if any.
   static SessionKeyInterface generateSessionKey(
     final Iterable<KeyInterface> encryptionKeys, [
-    final SymmetricAlgorithm defaultSymmetric = SymmetricAlgorithm.aes128,
+    final SymmetricAlgorithm defaultSymmetric = SymmetricAlgorithm.aes256,
   ]) {
     final SymmetricAlgorithm symmetric;
     if (encryptionKeys.isNotEmpty) {
@@ -163,7 +163,7 @@ final class LiteralMessage extends BaseMessage
   encrypt({
     final Iterable<KeyInterface> encryptionKeys = const [],
     final Iterable<String> passwords = const [],
-    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes128,
+    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes256,
   }) {
     final sessionKey = generateSessionKey(
       encryptionKeys,

diff --git a/lib/src/message/signature.dart b/lib/src/message/signature.dart
@@ -8,14 +8,14 @@ import '../common/armor.dart';
 import '../common/helpers.dart';
 import '../enum/armor_type.dart';
 import '../enum/hash_algorithm.dart';
-import '../message/verification.dart';
 import '../packet/base_packet.dart';
 import '../type/cleartext_message.dart';
 import '../type/key.dart';
 import '../type/literal_data.dart';
 import '../type/signature.dart';
 import '../type/signature_packet.dart';
 import '../type/verification.dart';
+import 'verification.dart';
 
 /// Signature class
 /// Author Nguyen Van Nguyen <[email protected]>

diff --git a/lib/src/message/signed_message.dart b/lib/src/message/signed_message.dart
@@ -6,13 +6,13 @@ library;
 
 import '../common/armor.dart';
 import '../enum/armor_type.dart';
-import '../message/signature.dart';
 import '../packet/packet_list.dart';
 import '../type/key.dart';
 import '../type/signature.dart';
 import '../type/signature_packet.dart';
 import '../type/signed_cleartext_message.dart';
 import 'cleartext_message.dart';
+import 'signature.dart';
 
 /// Signed message class that represents an OpenPGP cleartext signed message.
 /// See RFC 9580, section 7.

diff --git a/lib/src/packet/aead_encrypted_data.dart b/lib/src/packet/aead_encrypted_data.dart
@@ -81,7 +81,7 @@ final class AeadEncryptedDataPacket extends BasePacket
   factory AeadEncryptedDataPacket.encryptPackets(
     final Uint8List key,
     final PacketListInterface packets, {
-    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes128,
+    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes256,
     final AeadAlgorithm aead = AeadAlgorithm.ocb,
     final int chunkSize = 12,
   }) {
@@ -117,7 +117,7 @@ final class AeadEncryptedDataPacket extends BasePacket
   @override
   decrypt(
     final Uint8List key, [
-    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes128,
+    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes256,
   ]) {
     final length = encrypted.length;
     final data = encrypted.sublist(0, length - aead.tagLength);
@@ -147,7 +147,7 @@ final class AeadEncryptedDataPacket extends BasePacket
     final Uint8List key,
     final Uint8List data, {
     final Uint8List? finalChunk,
-    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes128,
+    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes256,
     final AeadAlgorithm aead = AeadAlgorithm.ocb,
     final chunkSizeByte = 0,
     final Uint8List? iv,

diff --git a/lib/src/packet/key/dsa_public_material.dart b/lib/src/packet/key/dsa_public_material.dart
@@ -5,7 +5,6 @@
 library;
 
 import 'dart:typed_data';
-
 import 'package:pointycastle/export.dart';
 
 import '../../common/helpers.dart';

diff --git a/lib/src/packet/key/rsa_secret_material.dart b/lib/src/packet/key/rsa_secret_material.dart
@@ -5,7 +5,6 @@
 library;
 
 import 'dart:typed_data';
-
 import 'package:pointycastle/pointycastle.dart';
 
 import '../../common/helpers.dart';

diff --git a/lib/src/packet/signature.dart b/lib/src/packet/signature.dart
@@ -501,8 +501,8 @@ final class SignaturePacket extends BasePacket
         KeyFlag.certifyKeys.value | KeyFlag.signData.value,
       ),
       PreferredSymmetricAlgorithms(Uint8List.fromList([
-        SymmetricAlgorithm.aes128.value,
         SymmetricAlgorithm.aes256.value,
+        SymmetricAlgorithm.aes128.value,
       ])),
       PreferredAeadAlgorithms(Uint8List.fromList([
         AeadAlgorithm.ocb.value,
@@ -529,18 +529,18 @@ final class SignaturePacket extends BasePacket
     if (version == KeyVersion.v6.value) {
       subpackets.add(PreferredAeadCiphers(Uint8List.fromList([
         ...[
-          SymmetricAlgorithm.aes128.value,
+          SymmetricAlgorithm.aes256.value,
           AeadAlgorithm.ocb.value,
-          SymmetricAlgorithm.aes128.value,
+          SymmetricAlgorithm.aes256.value,
           AeadAlgorithm.gcm.value,
-          SymmetricAlgorithm.aes128.value,
-          AeadAlgorithm.eax.value,
         ],
         ...[
-          SymmetricAlgorithm.aes256.value,
+          SymmetricAlgorithm.aes128.value,
           AeadAlgorithm.ocb.value,
-          SymmetricAlgorithm.aes256.value,
+          SymmetricAlgorithm.aes128.value,
           AeadAlgorithm.gcm.value,
+          SymmetricAlgorithm.aes128.value,
+          AeadAlgorithm.eax.value,
         ],
       ])));
     }

diff --git a/lib/src/packet/sym_encrypted_data.dart b/lib/src/packet/sym_encrypted_data.dart
@@ -70,7 +70,7 @@ final class SymEncryptedDataPacket extends BasePacket
   @override
   decrypt(
     final Uint8List key, [
-    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes128,
+    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes256,
   ]) {
     if (!Config.allowUnauthenticated) {
       throw AssertionError(

diff --git a/lib/src/packet/sym_encrypted_integrity_protected_data.dart b/lib/src/packet/sym_encrypted_integrity_protected_data.dart
@@ -131,7 +131,7 @@ final class SymEncryptedIntegrityProtectedDataPacket extends BasePacket
   factory SymEncryptedIntegrityProtectedDataPacket.encryptPackets(
     final Uint8List key,
     final PacketListInterface packets, {
-    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes128,
+    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes256,
     final AeadAlgorithm? aead,
   }) {
     Helper.assertSymmetric(symmetric);

diff --git a/lib/src/packet/sym_encrypted_session_key.dart b/lib/src/packet/sym_encrypted_session_key.dart
@@ -43,7 +43,7 @@ final class SymEncryptedSessionKeyPacket extends BasePacket {
     this.s2k,
     this.iv,
     this.encrypted, {
-    this.symmetric = SymmetricAlgorithm.aes128,
+    this.symmetric = SymmetricAlgorithm.aes256,
     this.aead,
     this.sessionKey,
   }) : super(PacketType.symEncryptedSessionKey) {
@@ -126,9 +126,9 @@ final class SymEncryptedSessionKeyPacket extends BasePacket {
 
   factory SymEncryptedSessionKeyPacket.encryptSessionKey(
     final String password, {
-    final SessionKeyInterface? sessionKey,
-    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes128,
+    final SymmetricAlgorithm symmetric = SymmetricAlgorithm.aes256,
     final AeadAlgorithm? aead,
+    final SessionKeyInterface? sessionKey,
   }) {
     Helper.assertSymmetric(symmetric);
 

diff --git a/lib/src/packet/user_attribute.dart b/lib/src/packet/user_attribute.dart
@@ -6,8 +6,8 @@ library;
 
 import 'dart:typed_data';
 
-import '../type/user_id_packet.dart';
 import '../common/extensions.dart';
+import '../type/user_id_packet.dart';
 import 'base_packet.dart';
 import 'image_user_attribute.dart';
 import 'subpacket_reader.dart';