Graphical code CAPTCHA partly finished, crypto class supports encryption/decryption...

[shipsimu.git] / inc / classes / main / crypto / class_CryptoHelper.php

diff --git a/inc/classes/main/crypto/class_CryptoHelper.php b/inc/classes/main/crypto/class_CryptoHelper.php
index cdde42113806c1e70aa1fbdda9f7a7c68bfbad16..2765abddbbb163014a22046bdc09d0c8d9ddf323 100644 (file)
--- a/inc/classes/main/crypto/class_CryptoHelper.php
+++ b/inc/classes/main/crypto/class_CryptoHelper.php
@@ -3,10 +3,10 @@
  * A helper class for cryptographical things like hashing passwords and so on
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
- * @version            0.3.0
+ * @version            0.0.0
  * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.mxchange.org
+ * @link               http://www.ship-simu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class CryptoHelper extends BaseFrameworkSystem {
+class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
        /**
         * An instance of this own clas
         */
@@ -64,7 +64,7 @@ class CryptoHelper extends BaseFrameworkSystem {
         */
        public final static function createCryptoHelper () {
                // Get a new instance
-               $cryptoInstance = self::getInstance();
+               $cryptoInstance = new CryptoHelper();
 
                // Initialize the hasher
                $cryptoInstance->initHasher();
@@ -82,7 +82,7 @@ class CryptoHelper extends BaseFrameworkSystem {
                // Is no instance there?
                if (is_null(self::$selfInstance)) {
                        // Then get a new one
-                       self::$selfInstance = new CryptoHelper();
+                       self::$selfInstance = self::createCryptoHelper();
                }
 
                // Return the instance
@@ -109,7 +109,7 @@ class CryptoHelper extends BaseFrameworkSystem {
         */
        private function generateSalt () {
                // Get a random string from the RNG
-               $randomString = $this->rngInstance->makeRandomString();
+               $randomString = $this->rngInstance->randomString();
 
                // Get config entry for salt length
                $length = $this->getConfigInstance()->readConfig('salt_length');
@@ -119,16 +119,19 @@ class CryptoHelper extends BaseFrameworkSystem {
        }
 
        /**
-        * Hashes a password with salt and returns the hash. If an old previous hash
+        * Hashes a string with salt and returns the hash. If an old previous hash
         * is supplied the method will use the first X chars of that hash for hashing
         * the password. This is useful if you want to check if the password is
         * identical for authorization purposes.
         *
-        * @param       $plainPassword  The plain password to use
-        * @param       $oldHash                A previously hashed password
-        * @return      $hashed                 The hashed and salted password
+        * @param       $str            Unhashed string
+        * @param       $oldHash        A hash from previous hashed string
+        * @return      $hashed         The hashed and salted string
         */
-       public function hashPassword ($plainPassword, $oldHash = "") {
+       public function hashString ($str, $oldHash = "") {
+               // Cast the string
+               $str = (string) $str;
+
                // Is the old password set?
                if (empty($oldHash)) {
                        // No, then use the current salt
@@ -142,15 +145,61 @@ class CryptoHelper extends BaseFrameworkSystem {
                }
 
                // Hash the password with salt
+               //* DEBUG: */ echo "salt=".$salt."/plain=".$str."<br />\n";
                $hashed = $salt . md5(sprintf($this->getConfigInstance()->readConfig('hash_mask'),
                        $salt,
-                       $this->rngInstance->getExtraSalt(),
-                       $plainPassword
+                       $this->rngInstance->getFixedSalt(),
+                       $str
                ));
 
                // And return it
                return $hashed;
        }
+
+       /**
+        * Encrypt the string with fixed salt
+        *
+        * @param       $str            The unencrypted string
+        * @return      $encrypted      Encrypted string
+        */
+       public function encryptString ($str) {
+               // Init crypto module
+               $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+               $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+
+               // Get key
+               $key = md5($this->rngInstance->getFixedSalt());
+
+               // Encrypt the string
+               $encrypted = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, $key, $str, MCRYPT_MODE_ECB, $iv);
+
+               // Return the string
+               return $encrypted;
+       }
+
+       /**
+        * Decrypt the string with fixed salt
+        *
+        * @param       $encrypted      Encrypted string
+        * @return      $str            The unencrypted string
+        */
+       public function decryptString ($encrypted) {
+               // Init crypto module
+               $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
+               $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
+
+               // Get key
+               $key = md5($this->rngInstance->getFixedSalt());
+
+               // Encrypt the string
+               $str = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $encrypted, MCRYPT_MODE_ECB, $iv);
+
+               // Trim trailing nulls away
+               $str = rtrim($str, "\0");
+
+               // Return the string
+               return $str;
+       }
 }
 
 // [EOF]