X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcrypto%2Fclass_CryptoHelper.php;h=1bf22a341543eae677c2a64549013fa942f18bb5;hp=b404317243265d7960599e4d6da74e96c109448d;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=146c8b3c929a1b0ab17d6605e5ae949ac44899c1

diff --git a/framework/main/classes/crypto/class_CryptoHelper.php b/framework/main/classes/crypto/class_CryptoHelper.php
index b4043172..1bf22a34 100644
--- a/framework/main/classes/crypto/class_CryptoHelper.php
+++ b/framework/main/classes/crypto/class_CryptoHelper.php
@@ -1,11 +1,11 @@
 <?php
 // Own namespace
-namespace CoreFramework\Helper\Crypto;
+namespace Org\Mxchange\CoreFramework\Helper\Crypto;
 
 // Import framework stuff
-use CoreFramework\Crypto\Cryptable;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Crypto\Cryptable;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * A helper class for cryptographical things like hashing passwords and so on
@@ -101,13 +101,17 @@ class CryptoHelper extends BaseFrameworkSystem implements Cryptable {
 	 * @return	void
 	 */
 	protected function attachCryptoStream () {
-		// Do we have mcrypt loaded?
+		// @TODO Maybe rewrite this with DirectoryIterator, similar to Compressor thing?
+		// Do we have openssl/mcrypt loaded?
 		if ($this->isPhpExtensionLoaded('mcrypt')) {
 			// Then use it
-			$this->cryptoStreamInstance = ObjectFactory::createObjectByName('McryptStream', array($this->getRngInstance()));
+			$this->cryptoStreamInstance = ObjectFactory::createObjectByName('Org\Mxchange\CoreFramework\Stream\Crypto\McryptStream', array($this->getRngInstance()));
+		} elseif ($this->isPhpExtensionLoaded('openssl')) {
+			// Then use it
+			$this->cryptoStreamInstance = ObjectFactory::createObjectByName('Org\Mxchange\CoreFramework\Stream\Crypto\OpenSslStream', array($this->getRngInstance()));
 		} else {
 			// If nothing works ...
-			$this->cryptoStreamInstance = ObjectFactory::createObjectByName('NullCryptoStream');
+			$this->cryptoStreamInstance = ObjectFactory::createObjectByName('Org\Mxchange\CoreFramework\Stream\Crypto\NullCryptoStream');
 		}
 	}