Fix in CryptoHelper class, templates are now loaded from application (templates in...

[core.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 0456e10dae2e1f8cb3c5a0929f9a1d7e66def337..ace0560299c24c38ecd1e65c7a889e6b083e0616 100644 (file)
--- a/inc/classes/main/crypto/class_CryptoHelper.php
+++ b/inc/classes/main/crypto/class_CryptoHelper.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -39,7 +39,12 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
        /**
         * Salt for hashing operations
         */
-       private $salt = "";
+       private $salt = '';
+
+       /**
+        * Seperator on many places
+        */
+       private $seperator = '|';
 
        /**
         * Protected constructor
@@ -126,7 +131,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
         * @param       $oldHash        A hash from previous hashed string
         * @return      $hashed         The hashed and salted string
         */
-       public function hashString ($str, $oldHash = "") {
+       public function hashString ($str, $oldHash = '') {
                // Cast the string
                $str = (string) $str;
 
@@ -166,7 +171,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
                $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
 
                // Get key
-               if ($this->getConfigInstance()->readConfig('crypt_fixed_salt') === "Y") {
+               if ($this->getConfigInstance()->readConfig('crypt_fixed_salt') == 'Y') {
                        $key = md5($this->rngInstance->getFixedSalt());
                } else {
                        $key = md5($this->rngInstance->getExtraSalt());
@@ -175,39 +180,39 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
                // Add some "garbage" to the string
                switch ($this->rngInstance->randomNumber(0, 8)) {
                        case 0:
-                               $garbageString = crc32($this->rngInstance->randomString(10))."|".base64_encode($str)."|".crc32($this->rngInstance->randomString(20));
+                               $garbageString = crc32($this->rngInstance->randomString(10)) . $this->seperator . base64_encode($str) . $this->seperator . crc32($this->rngInstance->randomString(20));
                                break;
 
                        case 1:
-                               $garbageString = crc32($this->rngInstance->randomString(10))."|".base64_encode($str)."|".md5($this->rngInstance->randomString(20));
+                               $garbageString = crc32($this->rngInstance->randomString(10)) . $this->seperator . base64_encode($str) . $this->seperator . md5($this->rngInstance->randomString(20));
                                break;
 
                        case 2:
-                               $garbageString = crc32($this->rngInstance->randomString(10))."|".base64_encode($str)."|".sha1($this->rngInstance->randomString(20));
+                               $garbageString = crc32($this->rngInstance->randomString(10)) . $this->seperator . base64_encode($str) . $this->seperator . sha1($this->rngInstance->randomString(20));
                                break;
 
                        case 3:
-                               $garbageString = md5($this->rngInstance->randomString(10))."|".base64_encode($str)."|".crc32($this->rngInstance->randomString(20));
+                               $garbageString = md5($this->rngInstance->randomString(10)) . $this->seperator . base64_encode($str) . $this->seperator . crc32($this->rngInstance->randomString(20));
                                break;
 
                        case 4:
-                               $garbageString = md5($this->rngInstance->randomString(10))."|".base64_encode($str)."|".md5($this->rngInstance->randomString(20));
+                               $garbageString = md5($this->rngInstance->randomString(10)) . $this->seperator . base64_encode($str) . $this->seperator . md5($this->rngInstance->randomString(20));
                                break;
 
                        case 5:
-                               $garbageString = md5($this->rngInstance->randomString(10))."|".base64_encode($str)."|".sha1($this->rngInstance->randomString(20));
+                               $garbageString = md5($this->rngInstance->randomString(10)) . $this->seperator . base64_encode($str) . $this->seperator . sha1($this->rngInstance->randomString(20));
                                break;
 
                        case 6:
-                               $garbageString = sha1($this->rngInstance->randomString(10))."|".base64_encode($str)."|".crc32($this->rngInstance->randomString(20));
+                               $garbageString = sha1($this->rngInstance->randomString(10)) . $this->seperator . base64_encode($str) . $this->seperator . crc32($this->rngInstance->randomString(20));
                                break;
 
                        case 7:
-                               $garbageString = sha1($this->rngInstance->randomString(10))."|".base64_encode($str)."|".md5($this->rngInstance->randomString(20));
+                               $garbageString = sha1($this->rngInstance->randomString(10)) . $this->seperator . base64_encode($str) . $this->seperator . md5($this->rngInstance->randomString(20));
                                break;
 
                        case 8:
-                               $garbageString = sha1($this->rngInstance->randomString(10))."|".base64_encode($str)."|".sha1($this->rngInstance->randomString(20));
+                               $garbageString = sha1($this->rngInstance->randomString(10)) . $this->seperator . base64_encode($str) . $this->seperator . sha1($this->rngInstance->randomString(20));
                                break;
                }
 
@@ -230,7 +235,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
                $iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
 
                // Get key
-               if ($this->getConfigInstance()->readConfig('crypt_fixed_salt') === "Y") {
+               if ($this->getConfigInstance()->readConfig('crypt_fixed_salt') == 'Y') {
                        $key = md5($this->rngInstance->getFixedSalt());
                } else {
                        $key = md5($this->rngInstance->getExtraSalt());
@@ -240,7 +245,7 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
                $garbageString = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $encrypted, MCRYPT_MODE_ECB, $iv);
 
                // Get the real string out
-               $strArray = explode("|", $garbageString);
+               $strArray = explode($this->seperator, $garbageString);
 
                // Does the element count match?
                assert(count($strArray) == 3);