tonyair/silverstripe-comments
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-comments synced 2024-10-22 11:05:49 +02:00
Code Issues Projects Releases Wiki Activity

Use hash_* shim

Browse Source
This commit is contained in:
Christopher Pitt 2015-05-06 10:55:10 +12:00
parent 297fb8666d
commit a31fc98b38
2 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
code/model/Comment.php
View File

@ -798,9 +798,7 @@ class Comment_SecurityToken {
* @return string
*/
protected function getToken($salt) {
return function_exists('hash_pbkdf2')
? hash_pbkdf2('sha256', $this->secret, $salt, 1000, 30)
: $this->hash_pbkdf2('sha256', $this->secret, $salt, 100, 30);
return hash_pbkdf2('sha256', $this->secret, $salt, 1000, 30);
}
/**
@ -872,41 +870,4 @@ class Comment_SecurityToken {
if($length !== null) return substr($result, 0, $length);
return $result;
}
/*-----------------------------------------------------------
* PBKDF2 Implementation (described in RFC 2898) from php.net
*-----------------------------------------------------------
* @param string a hash algorithm
* @param string p password
* @param string s salt
* @param int c iteration count (use 1000 or higher)
* @param int kl derived key length
* @param int st start position of result
*
* @return string derived key
*/
private function hash_pbkdf2($a, $p, $s, $c, $kl, $st = 0) {
$kb = $st + $kl; // Key blocks to compute
$dk = ''; // Derived key
// Create key
for($block = 1; $block <= $kb; $block++) {
// Initial hash for this block
$ib = $h = hash_hmac($a, $s . pack('N', $block), $p, true);
// Perform block iterations
for($i = 1; $i < $c; $i++) {
// XOR each iterate
$ib ^= ($h = hash_hmac($a, $h, $p, true));
}
$dk .= $ib; // Append iterated block
}
// Return derived key of correct length
return substr($dk, $st, $kl);
}
}

1
composer.json
View File

@ -8,6 +8,7 @@
"email": "will@fullscreen.io"
}],
"require": {
"assertchris/hash-compat": "~1.0",
"silverstripe/framework": "~3.1",
"colymba/gridfield-bulk-editing-tools": "~2.1"
},