diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-02-10 05:59:54 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-02-10 05:59:54 +0100 |
| commit | 4b450651ed3b9413be0245401da706c218850f53 (patch) | |
| tree | dddc1a22e67c3ee8b808ecca33f66de6d6672933 /system/libraries/Encryption.php | |
| parent | fc1e2780b2e559b596d6a86257c62c030c6e3cc7 (diff) | |
CI_Encryption: Rename 'base64' parameter to 'raw_data' and add docs
Diffstat (limited to 'system/libraries/Encryption.php')
| -rw-r--r-- | system/libraries/Encryption.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Encryption.php b/system/libraries/Encryption.php index e03e278fa..3a5409839 100644 --- a/system/libraries/Encryption.php +++ b/system/libraries/Encryption.php @@ -698,7 +698,7 @@ class CI_Encryption { 'mode' => $params['mode'], 'key' => $params['key'], 'iv' => isset($params['iv']) ? $params['iv'] : NULL, - 'base64' => isset($params['base64']) ? $params['base64'] : TRUE, + 'base64' => isset($params['raw_data']) ? ! $params['raw_data'] : FALSE, 'hmac_digest' => $params['hmac_digest'], 'hmac_key' => $params['hmac_key'] ); @@ -825,8 +825,8 @@ class CI_Encryption { * @param $key Input key * @param $digest A SHA-2 hashing algorithm * @param $salt Optional salt - * @param $info Optional context/application-specific info * @param $length Output length (defaults to the selected digest size) + * @param $info Optional context/application-specific info * @return string A pseudo-random key */ public function hkdf($key, $digest = 'sha512', $salt = NULL, $length = NULL, $info = '') |