Set default symmetric to Aes256

Signed-off-by: Nguyen Van Nguyen <nguyennv1981@gmail.com>
web-of-trust · Dec 20, 2024 · 8742529 · 8742529
1 parent 90a74ba
commit 8742529
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 39 deletions.
diff --git a/src/Common/Config.php b/src/Common/Config.php
@@ -37,7 +37,7 @@ final class Config
 
     private static HashAlgorithm $preferredHash = HashAlgorithm::Sha256;
 
-    private static SymmetricAlgorithm $preferredSymmetric = SymmetricAlgorithm::Aes128;
+    private static SymmetricAlgorithm $preferredSymmetric = SymmetricAlgorithm::Aes256;
 
     private static CompressionAlgorithm $preferredCompression = CompressionAlgorithm::Uncompressed;
 

diff --git a/src/Cryptor/Aead/CMac.php b/src/Cryptor/Aead/CMac.php
@@ -38,7 +38,7 @@ final class CMac
      * @return self
      */
     public function __construct(
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         private int $macSize = 0
     ) {
         $this->cipher = $symmetric->ecbCipherEngine();

diff --git a/src/Cryptor/Aead/EAX.php b/src/Cryptor/Aead/EAX.php
@@ -51,7 +51,7 @@ final class EAX implements AeadCipher
      */
     public function __construct(
         private readonly string $key,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ) {
         $this->cipher = $symmetric->cipherEngine(self::CIPHER_MODE);
         $this->cipher->setKey($key);

diff --git a/src/Cryptor/Aead/GCM.php b/src/Cryptor/Aead/GCM.php
@@ -35,7 +35,7 @@ final class GCM implements AeadCipher
      */
     public function __construct(
         string $key,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ) {
         $this->cipher = $symmetric->cipherEngine(self::CIPHER_MODE);
         $this->cipher->setKey($key);

diff --git a/src/Cryptor/Aead/OCB.php b/src/Cryptor/Aead/OCB.php
@@ -53,7 +53,7 @@ final class OCB implements AeadCipher
      */
     public function __construct(
         string $key,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ) {
         if ($symmetric->blockSize() !== self::BLOCK_LENGTH) {
             throw new \InvalidArgumentException(

diff --git a/src/Enum/SymmetricAlgorithm.php b/src/Enum/SymmetricAlgorithm.php
@@ -218,12 +218,8 @@ public function ecbCipherEngine(): Symmetric\EcbCipher
     static public function preferredSymmetrics(): array
     {
         return [
-            self::Aes128,
-            self::Aes192,
             self::Aes256,
-            self::Camellia128,
-            self::Camellia192,
-            self::Camellia256,
+            self::Aes128,
         ];
     }
 }
diff --git a/src/Key/PrivateKey.php b/src/Key/PrivateKey.php
@@ -312,7 +312,7 @@ public function getDecryptionKeyPackets(
     public function encrypt(
         string $passphrase,
         array $subkeyPassphrases = [],
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self {
         if (empty($passphrase)) {
             throw new \InvalidArgumentException(

diff --git a/src/Message/LiteralMessage.php b/src/Message/LiteralMessage.php
@@ -115,7 +115,7 @@ public static function fromLiteralData(
      */
     public static function generateSessionKey(
         array $encryptionKeys,
-        SymmetricAlgorithm $defaultSymmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $defaultSymmetric = SymmetricAlgorithm::Aes256
     ): SessionKeyInterface {
         $preferredSymmetrics = [];
         foreach ($encryptionKeys as $key) {
@@ -344,7 +344,7 @@ public function verifyDetached(
     public function encrypt(
         array $encryptionKeys = [],
         array $passwords = [],
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): EncryptedMessageInterface {
         $encryptionKeys = array_filter(
             $encryptionKeys,

diff --git a/src/Packet/AeadEncryptedData.php b/src/Packet/AeadEncryptedData.php
@@ -96,7 +96,7 @@ public static function fromBytes(string $bytes): self
     public static function encryptPackets(
         string $key,
         PacketListInterface $packetList,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self {
         Helper::assertSymmetric($symmetric);
 
@@ -171,7 +171,7 @@ public function getIV(): string
      */
     public function decrypt(
         string $key,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self {
         if ($this->packetList instanceof PacketListInterface) {
             return $this;
@@ -227,7 +227,7 @@ private static function crypt(
         string $key,
         string $data,
         string $finalChunk = "",
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         AeadAlgorithm $aead = AeadAlgorithm::Ocb,
         int $chunkSizeByte = 12,
         string $iv = ""

diff --git a/src/Packet/EncryptedDataTrait.php b/src/Packet/EncryptedDataTrait.php
@@ -41,7 +41,7 @@ public function getPacketList(): ?PacketListInterface
      */
     public function encrypt(
         string $key,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self {
         if ($this->packetList instanceof PacketListInterface) {
             return self::encryptPackets($key, $this->packetList, $symmetric);

diff --git a/src/Packet/Key/SessionKey.php b/src/Packet/Key/SessionKey.php
@@ -32,7 +32,7 @@ class SessionKey implements SessionKeyInterface
      */
     public function __construct(
         private readonly string $encryptionKey,
-        private readonly SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        private readonly SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         private readonly ?AeadAlgorithm $aead = null
     ) {
     }
@@ -60,7 +60,7 @@ public static function fromBytes(string $bytes): self
      * @return self
      */
     public static function produceKey(
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         ?AeadAlgorithm $aead = null
     ): self {
         return new self(

diff --git a/src/Packet/SecretKey.php b/src/Packet/SecretKey.php
@@ -323,7 +323,7 @@ public function isDecrypted(): bool
      */
     public function encrypt(
         string $passphrase,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         ?AeadAlgorithm $aead = null
     ): self {
         if ($this->isDecrypted()) {
@@ -565,7 +565,7 @@ protected static function generateKeyMaterial(
      */
     protected function encryptKeyMaterial(
         string $passphrase,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         ?AeadAlgorithm $aead = null
     ): array {
         Helper::assertSymmetric($symmetric);

diff --git a/src/Packet/SecretSubkey.php b/src/Packet/SecretSubkey.php
@@ -48,7 +48,7 @@ public function __construct(
         string $keyData = "",
         ?KeyMaterialInterface $keyMaterial = null,
         S2kUsage $s2kUsage = S2kUsage::None,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         ?S2KInterface $s2k = null,
         ?AeadAlgorithm $aead = null,
         string $iv = ""
@@ -129,7 +129,7 @@ public static function generate(
      */
     public function encrypt(
         string $passphrase,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         ?AeadAlgorithm $aead = null
     ): self {
         if ($this->isDecrypted()) {

diff --git a/src/Packet/Signature.php b/src/Packet/Signature.php
@@ -1142,16 +1142,16 @@ private static function keySignatureProperties(int $version): array
         if ($version === KeyVersion::V6->value) {
             $props[] = new Signature\PreferredAeadCiphers(
                 implode([
+                    chr(SymmetricAlgorithm::Aes256->value),
+                    chr(AeadAlgorithm::Ocb->value),
+                    chr(SymmetricAlgorithm::Aes256->value),
+                    chr(AeadAlgorithm::Gcm->value),
                     chr(SymmetricAlgorithm::Aes128->value),
                     chr(AeadAlgorithm::Ocb->value),
                     chr(SymmetricAlgorithm::Aes128->value),
                     chr(AeadAlgorithm::Gcm->value),
                     chr(SymmetricAlgorithm::Aes128->value),
                     chr(AeadAlgorithm::Eax->value),
-                    chr(SymmetricAlgorithm::Aes256->value),
-                    chr(AeadAlgorithm::Ocb->value),
-                    chr(SymmetricAlgorithm::Aes256->value),
-                    chr(AeadAlgorithm::Gcm->value),
                 ])
             );
         }

diff --git a/src/Packet/SymEncryptedData.php b/src/Packet/SymEncryptedData.php
@@ -63,7 +63,7 @@ public static function fromBytes(string $bytes): self
     public static function encryptPackets(
         string $key,
         PacketListInterface $packetList,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self {
         Helper::assertSymmetric($symmetric);
         $cipher = $symmetric->cipherEngine(Config::CIPHER_MODE);
@@ -110,7 +110,7 @@ public function toBytes(): string
      */
     public function decrypt(
         string $key,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self {
         if (!Config::allowUnauthenticated()) {
             throw new \RuntimeException("Message is not authenticated.");

diff --git a/src/Packet/SymEncryptedIntegrityProtectedData.php b/src/Packet/SymEncryptedIntegrityProtectedData.php
@@ -139,7 +139,7 @@ public static function fromBytes(string $bytes): self
     public static function encryptPackets(
         string $key,
         PacketListInterface $packetList,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         ?AeadAlgorithm $aead = null
     ): self {
         Helper::assertSymmetric($symmetric);
@@ -243,7 +243,7 @@ public function getSalt(): string
      */
     public function decrypt(
         string $key,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self {
         if ($this->packetList instanceof PacketListInterface) {
             return $this;
@@ -326,7 +326,7 @@ private static function aeadCrypt(
         string $key,
         string $data,
         string $finalChunk = "",
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         AeadAlgorithm $aead = AeadAlgorithm::Gcm,
         int $chunkSizeByte = 12,
         string $salt = ""

diff --git a/src/Packet/SymmetricKeyEncryptedSessionKey.php b/src/Packet/SymmetricKeyEncryptedSessionKey.php
@@ -48,7 +48,7 @@ class SymmetricKeyEncryptedSessionKey extends AbstractPacket implements
     public function __construct(
         private readonly int $version,
         private readonly S2KInterface $s2k,
-        private readonly SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        private readonly SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         private readonly ?AeadAlgorithm $aead = null,
         private readonly string $iv = "",
         private readonly string $encrypted = "",
@@ -138,7 +138,7 @@ public static function fromBytes(string $bytes): self
     public static function encryptSessionKey(
         string $password,
         ?SessionKeyInterface $sessionKey = null,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         ?AeadAlgorithm $aead = null
     ): self {
         $aeadProtect = $aead instanceof AeadAlgorithm;

diff --git a/src/Type/EncryptedDataPacketInterface.php b/src/Type/EncryptedDataPacketInterface.php
@@ -42,7 +42,7 @@ function getPacketList(): ?PacketListInterface;
      */
     function encrypt(
         string $key,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self;
 
     /**
@@ -62,7 +62,7 @@ function encryptWithSessionKey(SessionKeyInterface $sessionKey): self;
      */
     function decrypt(
         string $key,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self;
 
     /**

diff --git a/src/Type/LiteralMessageInterface.php b/src/Type/LiteralMessageInterface.php
@@ -101,7 +101,7 @@ function verifyDetached(
     function encrypt(
         array $encryptionKeys = [],
         array $passwords = [],
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): EncryptedMessageInterface;
 
     /**

diff --git a/src/Type/PrivateKeyInterface.php b/src/Type/PrivateKeyInterface.php
@@ -78,7 +78,7 @@ function getDecryptionKeyPackets(
     function encrypt(
         string $passphrase,
         array $subkeyPassphrases = [],
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256
     ): self;
 
     /**

diff --git a/src/Type/SecretKeyPacketInterface.php b/src/Type/SecretKeyPacketInterface.php
@@ -64,7 +64,7 @@ function isDecrypted(): bool;
      */
     function encrypt(
         string $passphrase,
-        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes128,
+        SymmetricAlgorithm $symmetric = SymmetricAlgorithm::Aes256,
         ?AeadAlgorithm $aead = null
     ): self;