Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / classes / streams / crypto / class_McryptStream.php

diff --git a/framework/main/classes/streams/crypto/class_McryptStream.php b/framework/main/classes/streams/crypto/class_McryptStream.php
index c0fa0d0f3e1b38bb4655c5a1f336addf2a529336..0c2fd3140aef9b2c51d3d7dcaf330f57409937bb 100644 (file)
--- a/framework/main/classes/streams/crypto/class_McryptStream.php
+++ b/framework/main/classes/streams/crypto/class_McryptStream.php
@@ -1,9 +1,11 @@
 <?php
 // Own namespace
 <?php
 // Own namespace

-namespace CoreFramework\Stream\Crypto;
+namespace Org\Mxchange\CoreFramework\Stream\Crypto;

 
 // Import framework stuff
 
 // Import framework stuff

-use CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
+use Org\Mxchange\CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
+use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
+use Org\Mxchange\CoreFramework\Stream\BaseStream;

 
 /**
  * A mcrypt-based encryption stream
 
 /**
  * A mcrypt-based encryption stream


@@ -29,11 +31,6 @@ use CoreFramework\Crypto\RandomNumber\RandomNumberGenerator;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class McryptStream extends BaseStream implements EncryptableStream {
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class McryptStream extends BaseStream implements EncryptableStream {

-       /**
-        * Separator on many places
-        */
-       const DATA_PAYLOAD_SEPARATOR = '|';
-

        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *


@@ -85,39 +82,39 @@ class McryptStream extends BaseStream implements EncryptableStream {
                // Add some "payload" to the string
                switch ($this->getRngInstance()->randomNumber(0, 8)) {
                        case 0:
                // Add some "payload" to the string
                switch ($this->getRngInstance()->randomNumber(0, 8)) {
                        case 0:

-                               $payloadString = crc32($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . crc32($this->getRngInstance()->randomString(20));
+                               $payloadString = crc32($this->getRngInstance()->randomString(10)) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . crc32($this->getRngInstance()->randomString(20));

                                break;
 
                        case 1:
                                break;
 
                        case 1:

-                               $payloadString = crc32($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . md5($this->getRngInstance()->randomString(20));
+                               $payloadString = crc32($this->getRngInstance()->randomString(10)) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . md5($this->getRngInstance()->randomString(20));

                                break;
 
                        case 2:
                                break;
 
                        case 2:

-                               $payloadString = crc32($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . sha1($this->getRngInstance()->randomString(20));
+                               $payloadString = crc32($this->getRngInstance()->randomString(10)) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . sha1($this->getRngInstance()->randomString(20));

                                break;
 
                        case 3:
                                break;
 
                        case 3:

-                               $payloadString = md5($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . crc32($this->getRngInstance()->randomString(20));
+                               $payloadString = md5($this->getRngInstance()->randomString(10)) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . crc32($this->getRngInstance()->randomString(20));

                                break;
 
                        case 4:
                                break;
 
                        case 4:

-                               $payloadString = md5($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . md5($this->getRngInstance()->randomString(20));
+                               $payloadString = md5($this->getRngInstance()->randomString(10)) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . md5($this->getRngInstance()->randomString(20));

                                break;
 
                        case 5:
                                break;
 
                        case 5:

-                               $payloadString = md5($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . sha1($this->getRngInstance()->randomString(20));
+                               $payloadString = md5($this->getRngInstance()->randomString(10)) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . sha1($this->getRngInstance()->randomString(20));

                                break;
 
                        case 6:
                                break;
 
                        case 6:

-                               $payloadString = sha1($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . crc32($this->getRngInstance()->randomString(20));
+                               $payloadString = sha1($this->getRngInstance()->randomString(10)) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . crc32($this->getRngInstance()->randomString(20));

                                break;
 
                        case 7:
                                break;
 
                        case 7:

-                               $payloadString = sha1($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . md5($this->getRngInstance()->randomString(20));
+                               $payloadString = sha1($this->getRngInstance()->randomString(10)) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . md5($this->getRngInstance()->randomString(20));

                                break;
 
                        case 8:
                                break;
 
                        case 8:

-                               $payloadString = sha1($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . sha1($this->getRngInstance()->randomString(20));
+                               $payloadString = sha1($this->getRngInstance()->randomString(10)) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . EncryptableStream::DATA_PAYLOAD_SEPARATOR . sha1($this->getRngInstance()->randomString(20));

                                break;
                }
 
                                break;
                }
 


@@ -150,7 +147,7 @@ class McryptStream extends BaseStream implements EncryptableStream {
                $payloadString = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $encrypted, MCRYPT_MODE_ECB, $iv);
 
                // Get the real string out
                $payloadString = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $encrypted, MCRYPT_MODE_ECB, $iv);
 
                // Get the real string out

-               $strArray = explode(self::DATA_PAYLOAD_SEPARATOR, $payloadString);
+               $strArray = explode(EncryptableStream::DATA_PAYLOAD_SEPARATOR, $payloadString);

 
                // Does the element count match?
                assert(count($strArray) == 3);
 
                // Does the element count match?
                assert(count($strArray) == 3);