Fix canonical padding.

c9141c24 · Paragon Initiative Enterprises · 74e31511 · c9141c24
Commit c9141c24 authored 2 years ago by Paragon Initiative Enterprises
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 0 deletions
+6 -0
--- a/src/Base64.php
+++ b/src/Base64.php
@@ -189,6 +189,9 @@ abstract class Base64 implements EncoderInterface
                    ((($c1 << 4) | ($c2 >> 2)) & 0xff)
                );
                $err |= ($c0 | $c1 | $c2) >> 8;
+                if ($strictPadding) {
+                    $err |= ($c2 << 6) & 0xff;
+                }
            } elseif ($i + 1 < $srcLen) {
                $c1 = static::decode6Bits($chunk[2]);
                $dest .= \pack(
@@ -196,6 +199,9 @@ abstract class Base64 implements EncoderInterface
                    ((($c0 << 2) | ($c1 >> 4)) & 0xff)
                );
                $err |= ($c0 | $c1) >> 8;
+                if ($strictPadding) {
+                    $err |= ($c1 << 4) & 0xff;
+                }
            } elseif ($strictPadding) {
                $err |= 1;
            }