Fix the presence of padding (#497)

Fix the presence of padding

Author: Spomky

KeyEncryption/AESCTR.php

@@ -47,7 +47,7 @@ public function decryptKey(JWK $key, string $encrypted_cek, array $header): stri
         $k = $this->getKey($key);
         isset($header['iv']) || throw new InvalidArgumentException('The header parameter "iv" is missing.');
         is_string($header['iv']) || throw new InvalidArgumentException('The header parameter "iv" is not valid.');
-        $iv = Base64UrlSafe::decode($header['iv']);
+        $iv = Base64UrlSafe::decodeNoPadding($header['iv']);
 
         $result = openssl_decrypt($encrypted_cek, $this->getMode(), $k, OPENSSL_RAW_DATA, $iv);
         if ($result === false) {
@@ -77,6 +77,6 @@ private function getKey(JWK $key): string
             throw new InvalidArgumentException('The key parameter "k" is invalid.');
         }
 
-        return Base64UrlSafe::decode($k);
+        return Base64UrlSafe::decodeNoPadding($k);
     }
 }

KeyEncryption/Chacha20Poly1305.php

@@ -61,7 +61,7 @@ public function decryptKey(JWK $key, string $encrypted_cek, array $header): stri
         $k = $this->getKey($key);
         isset($header['nonce']) || throw new InvalidArgumentException('The header parameter "nonce" is missing.');
         is_string($header['nonce']) || throw new InvalidArgumentException('The header parameter "nonce" is not valid.');
-        $nonce = Base64UrlSafe::decode($header['nonce']);
+        $nonce = Base64UrlSafe::decodeNoPadding($header['nonce']);
         if (mb_strlen($nonce, '8bit') !== 12) {
             throw new InvalidArgumentException('The header parameter "nonce" is not valid.');
         }
@@ -92,6 +92,6 @@ private function getKey(JWK $key): string
             throw new InvalidArgumentException('The key parameter "k" is invalid.');
         }
 
-        return Base64UrlSafe::decode($k);
+        return Base64UrlSafe::decodeNoPadding($k);
     }
 }