summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-06 04:36:47 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-06 04:36:47 +0100
commitdf7a6962beacc34b217dab61da8526f6570391e8 (patch)
tree76c9f03d359368830578b23e54d1d5b34ff5cbfa /system/libraries
parente8088d693d6bd8b08c1cdc397bbdebd7067844a5 (diff)
parent3aa781a65267d72000009df0fa2feee5cb3bdd8d (diff)
Merge changes from develop
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Session/drivers/Session_cookie.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/system/libraries/Session/drivers/Session_cookie.php b/system/libraries/Session/drivers/Session_cookie.php
index 5d338fc04..79712ad94 100644
--- a/system/libraries/Session/drivers/Session_cookie.php
+++ b/system/libraries/Session/drivers/Session_cookie.php
@@ -404,7 +404,15 @@ class CI_Session_cookie extends CI_Session_driver {
$hmac = substr($session, $len);
$session = substr($session, 0, $len);
- if ($hmac !== hash_hmac('sha1', $session, $this->encryption_key))
+ // Time-attack-safe comparison
+ $hmac_check = hash_hmac('sha1', $session, $this->encryption_key);
+ $diff = 0;
+ for ($i = 0; $i < 40; $i++)
+ {
+ $diff |= ord($hmac[$i]) ^ ord($hmac_check[$i]);
+ }
+
+ if ($diff !== 0)
{
log_message('error', 'Session: HMAC mismatch. The session cookie data did not match what was expected.');
$this->sess_destroy();