From 6b488674368cf695a228e87e7d8e0f4f40fe4181 Mon Sep 17 00:00:00 2001
From: Pascal Kriete <pascal.kriete@ellislab.com>
Date: Tue, 5 Apr 2011 15:02:15 -0400
Subject: Removing dohash and deprecating CI_SHA

---
 system/helpers/security_helper.php | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

(limited to 'system')

diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php
index 61ebf46f9..678dac821 100644
--- a/system/helpers/security_helper.php
+++ b/system/helpers/security_helper.php
@@ -64,22 +64,6 @@ if ( ! function_exists('sanitize_filename'))
 
 // --------------------------------------------------------------------
 
-/**
- * Hash encode a string
- *
- * This is simply an alias for do_hash()
- * dohash() is now deprecated
- */
-if ( ! function_exists('dohash'))
-{
-	function dohash($str, $type = 'sha1')
-	{
-		return do_hash($str, $type);
-	}
-}
-
-// --------------------------------------------------------------------
-
 /**
  * Hash encode a string
  *
@@ -93,23 +77,7 @@ if ( ! function_exists('do_hash'))
 	{
 		if ($type == 'sha1')
 		{
-			if ( ! function_exists('sha1'))
-			{
-				if ( ! function_exists('mhash'))
-				{
-					require_once(BASEPATH.'libraries/Sha1'.EXT);
-					$SH = new CI_SHA;
-					return $SH->generate($str);
-				}
-				else
-				{
-					return bin2hex(mhash(MHASH_SHA1, $str));
-				}
-			}
-			else
-			{
-				return sha1($str);
-			}
+			return sha1($str);
 		}
 		else
 		{
-- 
cgit v1.2.3-24-g4f1b