*
* @author Roland Haeder <webmaster@ship-simu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
protected function __construct ($className = __CLASS__) {
// Call parent constructor
parent::__construct($className);
-
- // Clean up a little
- $this->removeNumberFormaters();
- $this->removeSystemArray();
}
/**
* @param $extraInstance An extra instance for more salt (default: null)
* @return $rngInstance An instance of this random number generator
*/
- public final static function createRandomNumberGenerator (FrameworkInterface $extraInstance = null) {
+ public static final function createRandomNumberGenerator (FrameworkInterface $extraInstance = NULL) {
// Get a new instance
$rngInstance = new RandomNumberGenerator();
// Calculate the extra number which is always the same unless you give
// a better prime number
- $this->extraNumber = ($this->prime * $this->prime / (pi() ^ 2));
+ $this->extraNumber = ($this->prime * $this->prime / pow(pi(), 2));
// Seed mt_rand()
- mt_srand((double) sqrt(microtime() * 100000000 * $this->extraNumber));
+ mt_srand((double) sqrt(microtime(true) * 100000000 * $this->extraNumber));
// Set the server IP to cluster
$serverIp = 'cluster';
// Do we have a single server?
if ($this->getConfigInstance()->getConfigEntry('is_single_server') == 'Y') {
// Then use that IP for extra security
- $serverIp = $this->getConfigInstance()->getServerAddress();
+ $serverIp = $this->getConfigInstance()->detectServerAddress();
} // END - if
// Yet-another fixed salt. This is not dependend on server software or date
if ($extraInstance instanceof FrameworkInterface) {
// With extra instance information
- $this->fixedSalt = sha1($serverIp . ':' . $extraInstance->__toString() . ':' . serialize($this->getDatabaseInstance()->getConnectionData()));
+ $this->fixedSalt = sha1(
+ $serverIp . ':' .
+ $extraInstance->__toString() . ':' .
+ serialize($this->getDatabaseInstance()->getConnectionData())
+ );
} else {
// Without extra information
$this->fixedSalt = sha1($serverIp . ':' . serialize($this->getDatabaseInstance()->getConnectionData()));
}
// One-way data we need for "extra-salting" the random number
- $this->extraSalt = sha1($this->fixedSalt . ':' . getenv('SERVER_SOFTWARE') . ':' . $this->getConfigInstance()->getConfigEntry('date_key') . $this->getConfigInstance()->getConfigEntry('base_url'));
+ $this->extraSalt = sha1(
+ $this->fixedSalt . ':' .
+ getenv('SERVER_SOFTWARE') . ':' .
+ $this->getConfigInstance()->getConfigEntry('date_key') . ':' .
+ $this->getConfigInstance()->getConfigEntry('base_url')
+ );
// Get config entry for max salt length
$this->rndStrLen = $this->getConfigInstance()->getConfigEntry('rnd_str_length');
*/
public function randomString ($length = -1) {
// Is the number <1, then fix it to default length
- if ($length < 1) $length = $this->rndStrLen;
+ if ($length < 1) {
+ $length = $this->rndStrLen;
+ } // END - if
// Initialize the string
$randomString = '';
for ($idx = 0; $idx < $length; $idx++) {
// Add a random character and add it to our string
$randomString .= chr($this->randomNumber(0, 255));
- }
+ } // END - for
// Return the random string a little mixed up
return str_shuffle($randomString);
public final function getFixedSalt () {
return $this->fixedSalt;
}
+
+ /**
+ * Generates a key based on if we have extra (default) or fixed salt enabled
+ *
+ * @return $key The generated key for encryption
+ */
+ public function generateKey () {
+ // Default is extra salt
+ $key = md5($this->getExtraSalt());
+
+ // Get key
+ if ($this->getConfigInstance()->getConfigEntry('crypt_fixed_salt') == 'Y') {
+ $key = md5($this->getFixedSalt());
+ } // END - if
+
+ // Return it
+ return $key;
+ }
}
// [EOF]