Added better testing of generateInt, removed SUHOSIN demoting of URandom source

Author: ircmaxell

lib/CryptLib/Random/Source/URandom.php

@@ -38,12 +38,7 @@ class URandom implements \CryptLib\Random\Source {
      * @return Strength An instance of one of the strength classes
      */
     public static function getStrength() {
-        //This source is over-used by Suhosin patch, the strength is lowered
-        if (defined('S_ALL')) {
-            return new Strength(Strength::LOW);
-        } else {
-            return new Strength(Strength::MEDIUM);
-        }
+        return new Strength(Strength::MEDIUM);
     }
 
     /**

test/Unit/Random/Source/URandomTest.php

@@ -21,11 +21,7 @@ public static function provideGenerate() {
      * @covers CryptLib\Random\Source\URandom::getStrength
      */
     public function testGetStrength() {
-        if (defined('S_ALL')) {
-            $strength = new Strength(Strength::LOW);
-        } else {
-            $strength = new Strength(Strength::MEDIUM);
-        }
+        $strength = new Strength(Strength::MEDIUM);
         $actual = URandom::getStrength();
         $this->assertEquals($actual, $strength);
     }

test/Vectors/Random/GeneratorTest.php

@@ -26,25 +26,29 @@ public static function provideGenerateInt() {
             array(10, 100, 1),
             // Finally, let's try two large numbers
             array(100000, 100007, 5),
-            array(100000000, 100002047, 5)
+            array(100000000, 100002047, 5),
+            // Now, let's force a few loops by setting a valid offset
+            array(0, 5, 5, 2),
+            array(0, 9, 4, 2),
+            array(0, 27, 3, 4),
         );
     }
 
     /**
      * This test asserts that the algorithm that generates the integers does not
-     * actually introduce any bias into the generated numbers.  If this test 
+     * actually introduce any bias into the generated numbers.  If this test
      * passes, the generated integers from the generator will be as unbiased as
      * the sources that provide the data.
-     * 
+     *
      * @dataProvider provideGenerateInt
      */
-    public function testGenerateInt($min, $max, $shift) {
-        $generator = $this->getGenerator($max - $min, $shift);
+    public function testGenerateInt($min, $max, $shift, $offset = 0) {
+        $generator = $this->getGenerator($max - $min + $offset, $shift);
         for ($i = $max; $i >= $min; $i--) {
             $this->assertEquals($i, $generator->generateInt($min, $max));
         }
     }
-    
+
     public function getGenerator($random, $shift) {
         $source1  = new Source(array(
             'generate' => function ($size) use (&$random, $shift) {