Properly left-pad

paragonie · Jul 31, 2021 · 3902872 · 3902872
1 parent 9dc9aa5
commit 3902872
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/ECDSA/Signature.php b/src/ECDSA/Signature.php
@@ -6,6 +6,7 @@
 use Mdanter\Ecc\Crypto\Signature\SignatureInterface;
 use Mdanter\Ecc\Exception\SignatureDecodeException;
 use Mdanter\Ecc\Util\BinaryString;
+use ParagonIE\ConstantTime\Binary;
 
 /**
  * Class Signature
@@ -23,7 +24,7 @@ public function toString(int $length = 0): string
     {
         $r = gmp_strval($this->getR(), 16);
         $s = gmp_strval($this->getS(), 16);
-        $len = max(strlen($r), strlen($s), $length >> 1);
+        $len = max(Binary::safeStrlen($r), Binary::safeStrlen($s), $length);
         return str_pad($r, $len, '0', STR_PAD_LEFT) .
             str_pad($s, $len, '0', STR_PAD_LEFT);
     }

diff --git a/tests/K256Test.php b/tests/K256Test.php
@@ -71,5 +71,8 @@ public function testSign()
         $sig = $this->ecc->sign($message, $sk);
         $this->assertTrue($this->ecc->verify($message, $pk, $sig));
         $this->assertFalse($this->ecc->verify('samplf', $pk, $sig));
+
+        $sig = $this->ecc->sign($message, $sk, true);
+        $this->assertTrue($this->ecc->verify($message, $pk, $sig, true));
     }
 }
diff --git a/tests/P256Test.php b/tests/P256Test.php
@@ -71,5 +71,8 @@ public function testSign()
         $sig = $this->ecc->sign($message, $sk);
         $this->assertTrue($this->ecc->verify($message, $pk, $sig));
         $this->assertFalse($this->ecc->verify('samplf', $pk, $sig));
+
+        $sig = $this->ecc->sign($message, $sk, true);
+        $this->assertTrue($this->ecc->verify($message, $pk, $sig, true));
     }
 }
diff --git a/tests/P384Test.php b/tests/P384Test.php
@@ -71,5 +71,8 @@ public function testSign()
         $sig = $this->ecc->sign($message, $sk);
         $this->assertTrue($this->ecc->verify($message, $pk, $sig));
         $this->assertFalse($this->ecc->verify('samplf', $pk, $sig));
+
+        $sig = $this->ecc->sign($message, $sk, true);
+        $this->assertTrue($this->ecc->verify($message, $pk, $sig, true));
     }
 }