X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fstreams%2Fcrypto%2Fclass_McryptStream.php;h=bb6a89d783c0613f5ad820f4ca775a883a11199b;hp=1c3eeeb2eba4c6d502a4398a6b428b58f66a42b1;hb=f97af6b5b50bc961ec5ad850b73765d64811a5bc;hpb=b8cceeb06f0a81179a582af0538d8f56dd3c340c

diff --git a/inc/classes/main/streams/crypto/class_McryptStream.php b/inc/classes/main/streams/crypto/class_McryptStream.php
index 1c3eeeb2..bb6a89d7 100644
--- a/inc/classes/main/streams/crypto/class_McryptStream.php
+++ b/inc/classes/main/streams/crypto/class_McryptStream.php
@@ -23,9 +23,9 @@
  */
 class McryptStream extends BaseStream implements EncryptableStream {
 	/**
-	 * Seperator on many places
+	 * Separator on many places
 	 */
-	const DATA_PAYLOAD_SEPERATOR = '|';
+	const DATA_PAYLOAD_SEPARATOR = '|';
 
 	/**
 	 * Protected constructor
@@ -61,7 +61,7 @@ class McryptStream extends BaseStream implements EncryptableStream {
 	 * @param	$key		Optional key, if none provided, a random key will be generated
 	 * @return	$encrypted	Encrypted string
 	 */
-	public function encryptStream ($str, $key = null) {
+	public function encryptStream ($str, $key = NULL) {
 		// Init crypto module
 		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
 		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
@@ -75,39 +75,39 @@ class McryptStream extends BaseStream implements EncryptableStream {
 		// Add some "payload" to the string
 		switch ($this->getRngInstance()->randomNumber(0, 8)) {
 			case 0:
-				$payloadString = crc32($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPERATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPERATOR . crc32($this->getRngInstance()->randomString(20));
+				$payloadString = crc32($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . crc32($this->getRngInstance()->randomString(20));
 				break;
 
 			case 1:
-				$payloadString = crc32($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPERATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPERATOR . md5($this->getRngInstance()->randomString(20));
+				$payloadString = crc32($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . md5($this->getRngInstance()->randomString(20));
 				break;
 
 			case 2:
-				$payloadString = crc32($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPERATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPERATOR . sha1($this->getRngInstance()->randomString(20));
+				$payloadString = crc32($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . sha1($this->getRngInstance()->randomString(20));
 				break;
 
 			case 3:
-				$payloadString = md5($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPERATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPERATOR . crc32($this->getRngInstance()->randomString(20));
+				$payloadString = md5($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . crc32($this->getRngInstance()->randomString(20));
 				break;
 
 			case 4:
-				$payloadString = md5($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPERATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPERATOR . md5($this->getRngInstance()->randomString(20));
+				$payloadString = md5($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . md5($this->getRngInstance()->randomString(20));
 				break;
 
 			case 5:
-				$payloadString = md5($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPERATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPERATOR . sha1($this->getRngInstance()->randomString(20));
+				$payloadString = md5($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . sha1($this->getRngInstance()->randomString(20));
 				break;
 
 			case 6:
-				$payloadString = sha1($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPERATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPERATOR . crc32($this->getRngInstance()->randomString(20));
+				$payloadString = sha1($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . crc32($this->getRngInstance()->randomString(20));
 				break;
 
 			case 7:
-				$payloadString = sha1($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPERATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPERATOR . md5($this->getRngInstance()->randomString(20));
+				$payloadString = sha1($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . md5($this->getRngInstance()->randomString(20));
 				break;
 
 			case 8:
-				$payloadString = sha1($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPERATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPERATOR . sha1($this->getRngInstance()->randomString(20));
+				$payloadString = sha1($this->getRngInstance()->randomString(10)) . self::DATA_PAYLOAD_SEPARATOR . base64_encode($str) . self::DATA_PAYLOAD_SEPARATOR . sha1($this->getRngInstance()->randomString(20));
 				break;
 		}
 
@@ -125,7 +125,7 @@ class McryptStream extends BaseStream implements EncryptableStream {
 	 * @param	$key		Optional key, if none provided, a random key will be generated
 	 * @return	$str		The unencrypted string
 	 */
-	public function decryptStream ($encrypted, $key = null) {
+	public function decryptStream ($encrypted, $key = NULL) {
 		// Init crypto module
 		$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
 		$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
@@ -140,7 +140,7 @@ class McryptStream extends BaseStream implements EncryptableStream {
 		$payloadString = mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $key, $encrypted, MCRYPT_MODE_ECB, $iv);
 
 		// Get the real string out
-		$strArray = explode(self::DATA_PAYLOAD_SEPERATOR, $payloadString);
+		$strArray = explode(self::DATA_PAYLOAD_SEPARATOR, $payloadString);
 
 		// Does the element count match?
 		assert(count($strArray) == 3);