@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | private $saltedKey; |
55 | 55 | |
56 | 56 | /** |
57 | - * @param $key a per-site secret string which is used as the base encryption key. |
|
58 | - * @param $salt a per-session random string which is used as a salt to generate a per-session key |
|
57 | + * @param string $key a per-site secret string which is used as the base encryption key. |
|
58 | + * @param string $salt a per-session random string which is used as a salt to generate a per-session key |
|
59 | 59 | * |
60 | 60 | * The base encryption key needs to stay secret. If an attacker ever gets it, they can read their session, |
61 | 61 | * and even modify & re-sign it. |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | /** |
80 | 80 | * Encrypt and then sign some cleartext |
81 | 81 | * |
82 | - * @param $cleartext - The cleartext to encrypt and sign |
|
82 | + * @param string $cleartext - The cleartext to encrypt and sign |
|
83 | 83 | * @return string - The encrypted-and-signed message as base64 ASCII. |
84 | 84 | */ |
85 | 85 | public function encrypt($cleartext) { |
@@ -101,8 +101,8 @@ discard block |
||
101 | 101 | /** |
102 | 102 | * Check the signature on an encrypted-and-signed message, and if valid decrypt the content |
103 | 103 | * |
104 | - * @param $data - The encrypted-and-signed message as base64 ASCII |
|
105 | - * @return bool|string - The decrypted cleartext or false if signature failed |
|
104 | + * @param string $data - The encrypted-and-signed message as base64 ASCII |
|
105 | + * @return string|false - The decrypted cleartext or false if signature failed |
|
106 | 106 | */ |
107 | 107 | public function decrypt($data) { |
108 | 108 | $data = base64_decode($data); |
@@ -422,6 +422,9 @@ discard block |
||
422 | 422 | $this->setKey($this->getKey()); |
423 | 423 | } |
424 | 424 | |
425 | + /** |
|
426 | + * @param string $key |
|
427 | + */ |
|
425 | 428 | public function setKey($key) { |
426 | 429 | parent::setKey($key); |
427 | 430 | foreach($this->handlers as $handler) { |