diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-04 11:48:59 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-04 11:48:59 +0200 |
| commit | 226e7042ee4e9259b024b94a8b7e9ffa3bfcaa7c (patch) | |
| tree | 2e8f208c453b5907ef6ae43e19c242291212a563 | |
| parent | 13be5578e7ea440f4f33bc4c5c22096686224d66 (diff) | |
| parent | 824b4f220ca3dadc8f0945c665a7d7f8105a5dc4 (diff) | |
Merge pull request #1847 from daniel-honestempire/develop
Support for hashing algorithms other than SHA1 and MD5
| -rw-r--r-- | system/libraries/Encrypt.php | 4 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php index 8ffd93aea..679609251 100644 --- a/system/libraries/Encrypt.php +++ b/system/libraries/Encrypt.php @@ -484,7 +484,7 @@ class CI_Encrypt { */ public function set_hash($type = 'sha1') { - $this->_hash_type = ($type !== 'sha1' && $type !== 'md5') ? 'sha1' : $type; + $this->_hash_type = in_array($type, hash_algos()) ? $type : 'sha1'; } // -------------------------------------------------------------------- @@ -497,7 +497,7 @@ class CI_Encrypt { */ public function hash($str) { - return ($this->_hash_type === 'sha1') ? sha1($str) : md5($str); + return hash($this->_hash_type, $str); } } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index dd0cb9e35..4d7758659 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -204,6 +204,8 @@ Release Date: Not Released - Added $config['reuse_query_string'] to allow automatic repopulation of query string arguments, combined with normal URI segments. - Removed the default `` `` from a number of the configuration variables. - Added the ability to use a proxy with the :doc:`XML-RPC Library <libraries/xmlrpc>`. + - :doc:`Encryption Library <libraries/encrypt>` changes include: + - Added support for hashing algorithms other than SHA1 and MD5. - Core |