* Moved string to encrypt from constructor to encrypt_data method

* Added unit test to check encryption and decryption methods
glenscott · Feb 9, 2012 · 27c0b22 · 27c0b22
1 parent 7aaca56
commit 27c0b22
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/README b/README
@@ -6,7 +6,7 @@ require_once 'SimpleCrypt.php';
 print_r( SimpleCrypt::get_available_algorithms() );
 
 // encrypt a string using Triple DES (CBC mode)
-$crypt = new SimpleCrypt( 'tripledes', 'mysecretkey', 'stringtoencrypt' );
-$encrypted_data = $crypt->encrypt_data();
+$crypt = new SimpleCrypt( 'tripledes', 'mysecretkey' );
+$encrypted_data = $crypt->encrypt_data( 'stringtoencrypt' );
 echo "Encrypted data: " . bin2hex( $encrypted_data ) . "\n";
 echo "Decrypted data: " . $crypt->decrypt_data( $encrypted_data ) . "\n";
diff --git a/SimpleCrypt.php b/SimpleCrypt.php
@@ -32,10 +32,10 @@ class SimpleCrypt {
     private $iv;
 
 
-    public function __construct( $algorithm, $key, $input ) {
+    public function __construct( $algorithm, $key ) {
         $this->algorithm = $algorithm;
         $this->key       = $key;
-        $this->input     = $input;
+
 
         $this->open_module();
         $this->create_init_vector();
@@ -57,7 +57,9 @@ private function generic_init() {
         return mcrypt_generic_init( $this->td, $this->key, $this->iv );
     }
 
-    public function encrypt_data() {
+    public function encrypt_data( $input ) {
+        $this->input     = $input;
+
         $this->generic_init();
         $enc = mcrypt_generic( $this->td, $this->input );
         mcrypt_generic_deinit( $this->td );
@@ -69,7 +71,8 @@ public function encrypt_data() {
      * @param $enc string
      */
     public function decrypt_data( $enc ) {
-        $this->generic_init();
+        $ret = $this->generic_init();
+
         $dec = mdecrypt_generic( $this->td, $enc );
         mcrypt_generic_deinit( $this->td );
 

diff --git a/SimpleCryptTest.php b/SimpleCryptTest.php
@@ -5,19 +5,23 @@
 
 class SimpleCryptTest extends PHPUnit_Framework_TestCase {
     protected $simplecrypt;
+    private   $original_string;
 
     protected function setUp() {
-        $this->simplecrypt = new SimpleCrypt( 'tripledes', 'key', 'string' );
+        $this->original_string = 'very important data';
+        $this->simplecrypt = new SimpleCrypt( 'tripledes', 'mysecretkey' );
     }
 
     public function testObjectInstantiation() {
         $this->assertTrue( is_a( $this->simplecrypt, 'SimpleCrypt' ) );
     }
 
     public function testEncryptedStringIsIdentitalAfterDecryption() {
-        $this->markTestIncomplete(
-                                  'This test has not been completed yet.'
-                                  );
-        $this->assertEquals( 'string', $this->simplecrypt->decrypt_data( $this->simplecrypt->encrypt_data() ) );
+        $enc = $this->simplecrypt->encrypt_data( $this->original_string );
+        $this->assertTrue( is_string( $enc ) );
+
+        $dec = $this->simplecrypt->decrypt_data( $enc );
+        $this->assertTrue( is_string( $dec ) );
+        $this->assertTrue( strncmp( $dec, $this->original_string, strlen($this->original_string)) == 0 );
     }
 }
diff --git a/example.php b/example.php
@@ -6,7 +6,7 @@
 print_r( SimpleCrypt::get_available_algorithms() );
 
 // encrypt a string using Triple DES (CBC mode)
-$crypt = new SimpleCrypt( 'tripledes', 'mysecretkey', 'stringtoencrypt' );
-$encrypted_data = $crypt->encrypt_data();
+$crypt = new SimpleCrypt( 'tripledes', 'mysecretkey' );
+$encrypted_data = $crypt->encrypt_data( 'very important data' );
 echo "Encrypted data: " . bin2hex( $encrypted_data ) . "\n";
 echo "Decrypted data: " . $crypt->decrypt_data( $encrypted_data ) . "\n";