| @@ -75,7 +75,7 @@ | ||
| 75 | 75 | * | 
| 76 | 76 | * @param string $data - The encrypted-and-signed message as base64 ASCII | 
| 77 | 77 | * | 
| 78 | - * @return bool|string - The decrypted cleartext or false if signature failed | |
| 78 | + * @return string|false - The decrypted cleartext or false if signature failed | |
| 79 | 79 | */ | 
| 80 | 80 | public function decrypt($data) | 
| 81 | 81 |      { | 
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Control\Cookie; | 
| 6 | 6 | use SilverStripe\HybridSessions\Crypto\CryptoHandler; | 
| 7 | -use SilverStripe\Core\Config\Config; | |
| 8 | 7 | use SilverStripe\Core\Injector\Injector; | 
| 9 | 8 | |
| 10 | 9 | /** | 
| @@ -25,6 +25,7 @@ discard block | ||
| 25 | 25 | |
| 26 | 26 | /** | 
| 27 | 27 | * @param SessionHandlerInterface[] | 
| 28 | + * @param BaseStore[] $handlers | |
| 28 | 29 | * | 
| 29 | 30 | * @return $this | 
| 30 | 31 | */ | 
| @@ -38,6 +39,7 @@ discard block | ||
| 38 | 39 | |
| 39 | 40 | /** | 
| 40 | 41 | * @param string | 
| 42 | + * @param string $key | |
| 41 | 43 | * | 
| 42 | 44 | * @return $this | 
| 43 | 45 | */ | 
| @@ -35,8 +35,8 @@ discard block | ||
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | 37 | /** | 
| 38 | - * @param $key a per-site secret string which is used as the base encryption key. | |
| 39 | - * @param $salt a per-session random string which is used as a salt to generate a per-session key | |
| 38 | + * @param string $key a per-site secret string which is used as the base encryption key. | |
| 39 | + * @param string $salt a per-session random string which is used as a salt to generate a per-session key | |
| 40 | 40 | * | 
| 41 | 41 | * The base encryption key needs to stay secret. If an attacker ever gets it, they can read their session, | 
| 42 | 42 | * and even modify & re-sign it. | 
| @@ -87,7 +87,7 @@ discard block | ||
| 87 | 87 | * | 
| 88 | 88 | * @param $data - The encrypted-and-signed message as base64 ASCII | 
| 89 | 89 | * | 
| 90 | - * @return bool|string - The decrypted cleartext or false if signature failed | |
| 90 | + * @return string|false - The decrypted cleartext or false if signature failed | |
| 91 | 91 | */ | 
| 92 | 92 | public function decrypt($data) | 
| 93 | 93 |      { |