projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made NullCryptoStream compatible again wit implemented interface.
[core.git]
/
inc
/
classes
/
main
/
streams
/
crypto
/
class_NullCryptoStream.php
diff --git
a/inc/classes/main/streams/crypto/class_NullCryptoStream.php
b/inc/classes/main/streams/crypto/class_NullCryptoStream.php
index 79a326836eb1010bd3a03fec1f3757cb84bc68cd..c42e6d1fbefed0b1d384a343c8efcd97b7c7a478 100644
(file)
--- 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
* 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
*/
* @return $encrypted Encrypted string
*/
- public function encryptStream ($str) {
+ public function encryptStream ($str
, $key = NULL
) {
// Just handle it over
$encrypted = (string) $str;
// Just handle it over
$encrypted = (string) $str;