Fix Base Converter Issue When Value Of String === 0x30 (0), add tests to generateString

Author: ircmaxell

lib/CryptLib/Core/BaseConverter.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * A Utility class for converting between raw binary strings and a given 
- * list of characters 
+ * A Utility class for converting between raw binary strings and a given
+ * list of characters
  *
  * PHP version 5.3
  *
@@ -34,7 +34,10 @@ class BaseConverter {
      * @return string The converted string
      */
     public static function convertFromBinary($string, $characters) {
-        if (empty($string) || empty($characters)) {
+
+        if ($string === '' || empty($characters)) {
+            var_dump($string, $characters);
+            echo "Returned!";
             return '';
         }
         $string   = str_split($string);
@@ -46,7 +49,8 @@ public static function convertFromBinary($string, $characters) {
         $callback  = function ($num) use ($characters) {
             return $characters[$num];
         };
-        return implode('', array_map($callback, $converted));
+        $ret = implode('', array_map($callback, $converted));
+        return $ret;
     }
 
     /**

test/Vectors/Random/GeneratorTest.php

@@ -34,6 +34,75 @@ public static function provideGenerateInt() {
         );
     }
 
+    public function provideGenerateString() {
+        return array(
+            array(
+                1,
+                1,
+                "01",
+                function($j) {
+                    return str_pad(decbin($j), 1, '0', STR_PAD_LEFT);
+                }
+            ),
+            array(
+                2,
+                3,
+                "01",
+                function($j) {
+                    return str_pad(decbin($j), 2, '0', STR_PAD_LEFT);
+                }
+            ),
+            array(
+                3,
+                7,
+                "01",
+                function($j) {
+                    return str_pad(decbin($j), 3, '0', STR_PAD_LEFT);
+                }
+            ),
+            array(
+                8,
+                255,
+                "01",
+                function($j) {
+                    return str_pad(decbin($j), 8, '0', STR_PAD_LEFT);
+                }
+            ),
+            array(
+                16,
+                255,
+                "01",
+                function($j) {
+                    return str_pad(decbin($j), 16, '0', STR_PAD_LEFT);
+                }
+            ),
+            array(
+                1,
+                15,
+                "0123456789abcdef",
+                function($j) {
+                    return str_pad(dechex($j), 1, '0', STR_PAD_LEFT);
+                }
+            ),
+            array(
+                2,
+                255,
+                "0123456789abcdef",
+                function($j) {
+                    return str_pad(dechex($j), 2, '0', STR_PAD_LEFT);
+                }
+            ),
+            array(
+                3,
+                300,
+                "0123456789abcdef",
+                function($j) {
+                    return str_pad(dechex($j), 3, '0', STR_PAD_LEFT);
+                }
+            ),
+        );
+    }
+
     /**
      * This test asserts that the algorithm that generates the integers does not
      * actually introduce any bias into the generated numbers.  If this test
@@ -49,6 +118,21 @@ public function testGenerateInt($min, $max, $offset = 0) {
         }
     }
 
+    /**
+     * This test asserts that the algorithm that generates the strings does not
+     * actually introduce any bias into the generated numbers.  If this test
+     * passes, the generated strings from the generator will be as unbiased as
+     * the sources that provide the data.
+     *
+     * @dataProvider provideGenerateString
+     */
+    public function testGenerateString($length, $max, $chrs, $func) {
+        $generator = $this->getGenerator($max);
+        for ($i = $max; $i >= 0; $i--) {
+            $this->assertEquals($func($i), $generator->generateString($length, $chrs));
+        }
+    }
+
     public function getGenerator($random) {
         $source1  = new Source(array(
             'generate' => function ($size) use (&$random) {