More testing coverage work

Author: ircmaxell

lib/CryptLib/Encryption/Symmetric.php

@@ -40,7 +40,7 @@ public function derive($password, $salt, $iterations, $length) {
      * @return string The signature for this instance
      */
     public function getSignature() {
-        return 'schneier-'.$this->hash->getName();
+        return 'schneier-'.$this->hash;
     }
 
 }

lib/CryptLib/Key/Derivation/PBKDF/Schneier.php

@@ -45,7 +45,7 @@ class Factory extends \CryptLib\Core\AbstractFactory {
      */
     public function __construct() {
         $this->loadPBKDF();
-        //$this->loadKDF();
+        $this->loadKDF();
         //$this->loadSymmetricGenerators();
     }
 

lib/CryptLib/Key/Factory.php

@@ -0,0 +1,35 @@
+<?php
+
+use CryptLib\Key\Derivation\KDF\KDF1;
+
+class Unit_Key_Derivation_KDF_KDF1Test extends PHPUnit_Framework_TestCase {
+
+    public static function provideTestDerive() {
+        return array(
+            array('password', 20, '', '3f5d118200e8061deb178398380118bef891f395'),
+            array('password', 20, 'something', '46f4a5e6828a031d5db234045f836fd8a6f3ba17'),
+        );
+    }
+
+    /**
+     * @covers CryptLib\Key\Derivation\KDF\KDF1
+     * @covers CryptLib\Key\Derivation\AbstractDerivation
+     */
+    public function testConstruct() {
+        $pb = new KDF1();
+        $this->assertTrue($pb instanceof KDF1);
+    }
+
+    /**
+     * @covers CryptLib\Key\Derivation\KDF\KDF1
+     * @dataProvider provideTestDerive
+     * @group slow
+     */
+    public function testDerive($p, $len, $data, $expect) {
+        $pb = new KDF1();
+        $actual = $pb->derive($p, $len, $data);
+        $actual = bin2hex($actual);
+        $this->assertEquals($expect, $actual);
+    }
+
+}

test/Unit/Key/Derivation/KDF/KDF1Test.php

@@ -0,0 +1,35 @@
+<?php
+
+use CryptLib\Key\Derivation\KDF\KDF2;
+
+class Unit_Key_Derivation_KDF_KDF2Test extends PHPUnit_Framework_TestCase {
+
+    public static function provideTestDerive() {
+        return array(
+            array('password', 20, '', 'b4de807b408717196ca96c0c114e0f881f0b6ef8'),
+            array('password', 20, 'something', '96a482a79360192704f20716016c8850890db856'),
+        );
+    }
+
+    /**
+     * @covers CryptLib\Key\Derivation\KDF\KDF2
+     * @covers CryptLib\Key\Derivation\AbstractDerivation
+     */
+    public function testConstruct() {
+        $pb = new KDF2();
+        $this->assertTrue($pb instanceof KDF2);
+    }
+
+    /**
+     * @covers CryptLib\Key\Derivation\KDF\KDF2
+     * @dataProvider provideTestDerive
+     * @group slow
+     */
+    public function testDerive($p, $len, $data, $expect) {
+        $pb = new KDF2();
+        $actual = $pb->derive($p, $len, $data);
+        $actual = bin2hex($actual);
+        $this->assertEquals($expect, $actual);
+    }
+
+}

test/Unit/Key/Derivation/KDF/KDF2Test.php

@@ -0,0 +1,35 @@
+<?php
+
+use CryptLib\Key\Derivation\KDF\KDF3;
+
+class Unit_Key_Derivation_KDF_KDF3Test extends PHPUnit_Framework_TestCase {
+
+    public static function provideTestDerive() {
+        return array(
+            array('password', 20, '', '20c74d01389f8cbfba727e951e62fdbd206019c1'),
+            array('password', 20, 'something', 'ad952bdfebba1bb06299fca88495e1d404e0c780'),
+        );
+    }
+
+    /**
+     * @covers CryptLib\Key\Derivation\KDF\KDF3
+     * @covers CryptLib\Key\Derivation\AbstractDerivation
+     */
+    public function testConstruct() {
+        $pb = new KDF3();
+        $this->assertTrue($pb instanceof KDF3);
+    }
+
+    /**
+     * @covers CryptLib\Key\Derivation\KDF\KDF3
+     * @dataProvider provideTestDerive
+     * @group slow
+     */
+    public function testDerive($p, $len, $data, $expect) {
+        $pb = new KDF3();
+        $actual = $pb->derive($p, $len, $data);
+        $actual = bin2hex($actual);
+        $this->assertEquals($expect, $actual);
+    }
+
+}

test/Unit/Key/Derivation/KDF/KDF3Test.php

@@ -0,0 +1,41 @@
+<?php
+
+use CryptLib\Key\Derivation\PBKDF\BCrypt;
+
+class Unit_Key_Derivation_PBKDF_BCryptTest extends PHPUnit_Framework_TestCase {
+
+    public static function provideTestDerive() {
+        return array(
+            array('password', 'salt', 1, 20, '$2a$04$c2FsdA//$$$$$$$$$$$$$.s/cqDDqZHdfICtEE.ehrDKzSnRzlgJ2'),
+            array('password', 'somelongsaltstringherewithmore', 1, 20, '$2a$04$c29tZWxvbmdzYWx0c3RyaODWXyN.i8AWP0fApQMGEDItVQbPIti6u'),
+        );
+    }
+
+    /**
+     * @covers CryptLib\Key\Derivation\PBKDF\BCrypt
+     * @covers CryptLib\Key\Derivation\AbstractDerivation
+     */
+    public function testConstruct() {
+        $pb = new BCrypt();
+        $this->assertTrue($pb instanceof BCrypt);
+    }
+
+    /**
+     * @covers CryptLib\Key\Derivation\PBKDF\BCrypt
+     * @dataProvider provideTestDerive
+     * @group slow
+     */
+    public function testDerive($p, $s, $c, $len, $expect) {
+        $pb = new BCrypt();
+        $actual = $pb->derive($p, $s, $c, $len);
+        $this->assertEquals($expect, $actual);
+    }
+
+    /**
+     * @covers CryptLib\Key\Derivation\PBKDF\BCrypt
+     */
+    public function testGetSignature() {
+        $pb = new BCrypt();
+        $this->assertEquals('bcrypt', $pb->getSignature());
+    }
+}