Use binary-safe functions consistently.

paragonie · Nov 18, 2016 · 8f967f8 · 8f967f8
1 parent 540c667
commit 8f967f8
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/SeedSpring.php b/src/SeedSpring.php
@@ -28,11 +28,7 @@ final class SeedSpring
      */
     public function __construct($seed = '', $counter = 0)
     {
-        if (\function_exists('\\mb_strlen')) {
-            if (\mb_strlen($seed, '8bit') !== 16) {
-                throw new \InvalidArgumentException('Seed must be 16 bytes');
-            }
-        } elseif (Binary::safeStrlen($seed) !== 16) {
+        if (Binary::safeStrlen($seed) !== 16) {
             throw new \InvalidArgumentException('Seed must be 16 bytes');
         }
         $this->seed('set', $seed);
@@ -106,6 +102,8 @@ public function getBytes($numBytes)
      * @param int $min
      * @param int $max
      * @return int
+     * @throws \Error
+     * @throws \Exception
      */
     public function getInt($min, $max)
     {
@@ -243,7 +241,7 @@ protected function getNonce($increment = 0)
         $incr = (int) \ceil(($increment + ($increment % 16)) / 16);
         $this->counter += $incr;
         while ($ctr > 0) {
-            $nonce = \chr($ctr & 0xFF) . $nonce;
+            $nonce = \pack('C', $ctr & 0xFF) . $nonce;
             $ctr >>= 8;
         }
         return \str_pad($nonce, 16, "\0", STR_PAD_LEFT);