Fix #74

paragonie · Apr 20, 2018 · 157ca23 · 157ca23
1 parent ed7c455
commit 157ca23
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Protocol/Version1.php b/src/Protocol/Version1.php
@@ -236,10 +236,10 @@ public static function verify(
         }
         if (\is_null($footer)) {
             $footer = Util::extractFooter($signMsg);
-            $signMsg = Util::removeFooter($signMsg);
         } else {
             $signMsg = Util::validateAndRemoveFooter($signMsg, $footer);
         }
+        $signMsg = Util::removeFooter($signMsg);
         $expectHeader = self::HEADER . '.public.';
         $givenHeader = Binary::safeSubstr($signMsg, 0, 10);
         if (!\hash_equals($expectHeader, $givenHeader)) {

diff --git a/src/Protocol/Version2.php b/src/Protocol/Version2.php
@@ -218,10 +218,10 @@ public static function verify(
         }
         if (\is_null($footer)) {
             $footer = Util::extractFooter($signMsg);
-            $signMsg = Util::removeFooter($signMsg);
         } else {
             $signMsg = Util::validateAndRemoveFooter($signMsg, $footer);
         }
+        $signMsg = Util::removeFooter($signMsg);
         /** @var string $footer */
         $expectHeader = self::HEADER . '.public.';
         $givenHeader = Binary::safeSubstr($signMsg, 0, 10);

diff --git a/tests/Version1Test.php b/tests/Version1Test.php
@@ -153,9 +153,9 @@ public function testSign()
             $this->assertInternalType('string', $signed);
             $this->assertSame('v1.public.', Binary::safeSubstr($signed, 0, 10));
             try {
-                Version1::verify($signed, $publicKey);
+                Version1::verify($signed, $publicKey, '');
                 $this->fail('Missing footer');
-            } catch (\Exception $ex) {
+            } catch (PasetoException $ex) {
             }
             $decode = Version1::verify($signed, $publicKey, 'footer');
             $this->assertInternalType('string', $decode);

diff --git a/tests/Version2Test.php b/tests/Version2Test.php
@@ -134,9 +134,9 @@ public function testSign()
             $this->assertInternalType('string', $signed);
             $this->assertSame('v2.public.', Binary::safeSubstr($signed, 0, 10));
             try {
-                Version2::verify($signed, $publicKey);
+                Version2::verify($signed, $publicKey, '');
                 $this->fail('Missing footer');
-            } catch (\Exception $ex) {
+            } catch (PasetoException $ex) {
             }
             $decode = Version2::verify($signed, $publicKey, 'footer');
             $this->assertInternalType('string', $decode);