Debugging continued:

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

diff --git a/inc/main/classes/streams/crypto/class_McryptStream.php b/inc/main/classes/streams/crypto/class_McryptStream.php
index f39b4d059a68dc1c6f2c4020f008958527422aee..f614d0d32f175b348c21733d06ff0d65c90939b4 100644 (file)
--- a/inc/main/classes/streams/crypto/class_McryptStream.php
+++ b/inc/main/classes/streams/crypto/class_McryptStream.php
@@ -1,4 +1,7 @@
 <?php
+// Own namespace
+namespace CoreFramework\Stream\Crypto;
+
 /**
  * A mcrypt-based encryption stream
  *
@@ -7,6 +10,7 @@
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
+ * @todo               mcrypt will become deprecated, rewrite to OpenSSL
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +67,7 @@ class McryptStream extends BaseStream implements EncryptableStream {
         */
        public function encryptStream ($str, $key = NULL) {
                // Debug message
-               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: key[' . gettype($key) . ']=' . $key);
+               //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: key[' . gettype($key) . ']=' . $key);
 
                // Init crypto module
                $iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
@@ -166,10 +170,8 @@ class McryptStream extends BaseStream implements EncryptableStream {
         * @throws      UnsupportedOperationException   If this method is called (which is a mistake)
         */
        public function streamData ($data) {
-               self::createDebugInstance(__CLASS__)->debugOutput('Unhandled ' . strlen($data) . ' bytes in this stream.');
+               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Unhandled ' . strlen($data) . ' bytes in this stream.');
                throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION);
        }
-}
 
-// [EOF]
-?>
+}