summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-18 22:08:18 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-18 22:08:18 +0100
commit25357cd7886b95d1e77b6a539a4588a265688874 (patch)
treee9cf1fafce0abcf2174d6763d32b300987fabaf9
parente3a0b2b4cba04f4f0925b6b16d15416aa66e8a85 (diff)
parent8840c96cc0608859ad4b5341c31db9bb1f833792 (diff)
Merge pull request #1198 from freewil/do_hash
use php's hash() function for do_hash() helper
-rw-r--r--system/helpers/security_helper.php2
-rw-r--r--user_guide_src/source/changelog.rst1
-rw-r--r--user_guide_src/source/helpers/security_helper.rst7
3 files changed, 6 insertions, 4 deletions
diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php
index e05e947a5..16dfb0de3 100644
--- a/system/helpers/security_helper.php
+++ b/system/helpers/security_helper.php
@@ -87,7 +87,7 @@ if ( ! function_exists('do_hash'))
{
function do_hash($str, $type = 'sha1')
{
- return ($type === 'sha1') ? sha1($str) : md5($str);
+ return hash($type, $str);
}
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 274026481..45bd41beb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -47,6 +47,7 @@ Release Date: Not Released
- Added a work-around in force_download() for a bug Android <= 2.1, where the filename extension needs to be in uppercase.
- form_dropdown() will now also take an array for unity with other form helpers.
- set_realpath() can now also handle file paths as opposed to just directories.
+ - do_hash() now uses PHP's native hash() function, supporting more algorithms.
- Database
diff --git a/user_guide_src/source/helpers/security_helper.rst b/user_guide_src/source/helpers/security_helper.rst
index 01018c61a..b1bcf2b4a 100644
--- a/user_guide_src/source/helpers/security_helper.rst
+++ b/user_guide_src/source/helpers/security_helper.rst
@@ -34,8 +34,9 @@ More info can be found there.
do_hash()
=========
-Permits you to create SHA1 or MD5 one way hashes suitable for encrypting
-passwords. Will create SHA1 by default. Examples
+Permits you to create one way hashes suitable for encrypting
+passwords. Will create SHA1 by default. See `hash_algos() <http://php.net/function.hash_algos>`_
+for a full list of supported algorithms.
::
@@ -43,7 +44,7 @@ passwords. Will create SHA1 by default. Examples
$str = do_hash($str, 'md5'); // MD5
.. note:: This function was formerly named dohash(), which has been
- deprecated in favor of `do_hash()`.
+ removed in favor of `do_hash()`.
strip_image_tags()
==================