From 7fc78debfdfd9f5d1e2f14804885ad41d55aa444 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 5 Feb 2014 19:16:45 +0100 Subject: [PATCH 1/1] Made NullCryptoStream compatible again wit implemented interface. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/classes/main/streams/crypto/class_NullCryptoStream.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/classes/main/streams/crypto/class_NullCryptoStream.php b/inc/classes/main/streams/crypto/class_NullCryptoStream.php index 79a32683..c42e6d1f 100644 --- a/inc/classes/main/streams/crypto/class_NullCryptoStream.php +++ b/inc/classes/main/streams/crypto/class_NullCryptoStream.php @@ -50,9 +50,10 @@ class NullCryptoStream extends BaseStream implements EncryptableStream { * 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 encryptStream ($str) { + public function encryptStream ($str, $key = NULL) { // Just handle it over $encrypted = (string) $str; -- 2.30.2