Disable padding

Signed-off-by: Nguyen Van Nguyen <nguyennv1981@gmail.com>
web-of-trust · Oct 22, 2024 · ccdafa0 · ccdafa0
1 parent c9843a4
commit ccdafa0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/src/Packet/SecretKey.php b/src/Packet/SecretKey.php
@@ -453,6 +453,7 @@ public function encrypt(
                 );
             } else {
                 $cipher = $symmetric->cipherEngine(S2kUsage::Cfb->name);
+                $cipher->disablePadding();
                 $cipher->setIV($iv);
                 $cipher->setKey($kek);
 
@@ -505,6 +506,7 @@ public function decrypt(string $passphrase): self
                 );
             } else {
                 $cipher = $this->symmetric->cipherEngine(S2kUsage::Cfb->name);
+                $cipher->disablePadding();
                 $cipher->setIV($this->iv);
                 $cipher->setKey($kek);
                 $decrypted = $cipher->decrypt($this->keyData);

diff --git a/src/Packet/SymEncryptedData.php b/src/Packet/SymEncryptedData.php
@@ -67,6 +67,7 @@ public static function encryptPackets(
     ): self {
         Helper::assertSymmetric($symmetric);
         $cipher = $symmetric->cipherEngine(Config::CIPHER_MODE);
+        $cipher->disablePadding();
         $cipher->setKey($key);
         $cipher->setIV(str_repeat(Helper::ZERO_CHAR, $symmetric->blockSize()));
         $prefix = $cipher->encrypt(Helper::generatePrefix($symmetric));
@@ -119,6 +120,7 @@ public function decrypt(
         } else {
             $blockSize = $symmetric->blockSize();
             $cipher = $symmetric->cipherEngine(Config::CIPHER_MODE);
+            $cipher->disablePadding();
             $cipher->setKey($key);
             $cipher->setIV(substr($this->encrypted, 2, $blockSize));
 

diff --git a/src/Packet/SymEncryptedIntegrityProtectedData.php b/src/Packet/SymEncryptedIntegrityProtectedData.php
@@ -168,6 +168,7 @@ public static function encryptPackets(
             $plainText = $toHash . hash(self::HASH_ALGO, $toHash, true);
 
             $cipher = $symmetric->cipherEngine(Config::CIPHER_MODE);
+            $cipher->disablePadding();
             $cipher->setKey($key);
             $cipher->setIV(
                 str_repeat(Helper::ZERO_CHAR, $symmetric->blockSize())
@@ -265,6 +266,7 @@ public function decrypt(
                 $symmetric = $this->symmetric ?? $symmetric;
                 $size = $symmetric->blockSize();
                 $cipher = $symmetric->cipherEngine(Config::CIPHER_MODE);
+                $cipher->disablePadding();
                 $cipher->setKey($key);
                 $cipher->setIV(str_repeat(Helper::ZERO_CHAR, $size));
 

diff --git a/src/Packet/SymmetricKeyEncryptedSessionKey.php b/src/Packet/SymmetricKeyEncryptedSessionKey.php
@@ -171,6 +171,7 @@ public static function encryptSessionKey(
                 );
             } else {
                 $cipher = $symmetric->cipherEngine(Config::CIPHER_MODE);
+                $cipher->disablePadding();
                 $cipher->setKey($key);
                 $cipher->setIV(
                     str_repeat(Helper::ZERO_CHAR, $symmetric->blockSize())
@@ -307,6 +308,7 @@ public function decrypt(string $password): self
                     $cipher = $this->symmetric->cipherEngine(
                         Config::CIPHER_MODE
                     );
+                    $cipher->disablePadding();
                     $cipher->setKey($key);
                     $cipher->setIV(
                         str_repeat(