*
* @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 - 2011 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.ship-simu.org
*
protected function __construct () {
// Call parent constructor
parent::__construct(__CLASS__);
-
- // Clean up a little
- $this->removeNumberFormaters();
- $this->removeSystemArray();
}
/**
*
* @return $cryptoInstance An instance of this crypto helper class
*/
- public final static function createCryptoHelper () {
+ public static final function createCryptoHelper () {
// Get a new instance
$cryptoInstance = new CryptoHelper();
*
* @return $selfInstance An instance of this crypto helper class
*/
- public final static function getInstance () {
+ public static final function getInstance () {
// Is no instance there?
if (is_null(self::$selfInstance)) {
// Then get a new one
*/
protected function attachCryptoStream () {
// Do we have mcrypt loaded?
- if ($this->isPhpModuleLoaded('mcrypt')) {
+ if ($this->isPhpExtensionLoaded('mcrypt')) {
// Then use it
- $this->cryptoStreamInstance = ObjectFactory::createObjectByName('McryptStream', array($this->rngInstance()))
+ $this->cryptoStreamInstance = ObjectFactory::createObjectByName('McryptStream', array($this->getRngInstance()));
} else {
// If nothing works ...
$this->cryptoStreamInstance = ObjectFactory::createObjectByName('NullCryptoStream');
*/
protected function initHasher () {
// Initialize the random number generator which is required by some crypto methods
- $this->rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class');
+ $this->setRngInstance(ObjectFactory::createObjectByConfiguredName('rng_class'));
// Generate a salt for the hasher
$this->generateSalt();
*/
private function generateSalt () {
// Get a random string from the RNG
- $randomString = $this->rngInstance->randomString();
+ $randomString = $this->getRngInstance()->randomString();
// Get config entry for salt length
$length = $this->getConfigInstance()->getConfigEntry('salt_length');
//* DEBUG: */ echo "salt=".$salt."/plain=".$str."<br />\n";
$hashed = $salt . md5(sprintf($this->getConfigInstance()->getConfigEntry('hash_mask'),
$salt,
- $this->rngInstance->getFixedSalt(),
+ $this->getRngInstance()->getFixedSalt(),
$str
));
* Encrypt the string with fixed salt
*
* @param $str The unencrypted string
+ * @param $key Optional key, if none provided, a random key will be generated
* @return $encrypted Encrypted string
*/
- public function encryptString ($str) {
+ public function encryptString ($str, $key = null) {
// Encrypt the string through the stream
- $encryted = $this->cryptoStreamInstance->encryptStream($str);
+ $encrypted = $this->cryptoStreamInstance->encryptStream($str, $key);
// Return the string
return $encrypted;