From 20b5d73def48f24dc62cfecce8a0881eb3db6195 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 11 May 2015 20:57:34 +0200 Subject: [PATCH] Added scrypt stuff. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/classes/main/scrypt/.htaccess | 1 + inc/classes/main/scrypt/class_Scrypt.php | 225 +++++++++++++++++++++++ inc/classes/third_party/scrypt/.htaccess | 1 + inc/classes/third_party/scrypt/CREDITS | 2 + inc/classes/third_party/scrypt/LICENSE | 15 ++ inc/classes/third_party/scrypt/README.md | 90 +++++++++ 6 files changed, 334 insertions(+) create mode 100644 inc/classes/main/scrypt/.htaccess create mode 100644 inc/classes/main/scrypt/class_Scrypt.php create mode 100644 inc/classes/third_party/scrypt/.htaccess create mode 100644 inc/classes/third_party/scrypt/CREDITS create mode 100644 inc/classes/third_party/scrypt/LICENSE create mode 100644 inc/classes/third_party/scrypt/README.md diff --git a/inc/classes/main/scrypt/.htaccess b/inc/classes/main/scrypt/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/classes/main/scrypt/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/classes/main/scrypt/class_Scrypt.php b/inc/classes/main/scrypt/class_Scrypt.php new file mode 100644 index 00000000..8949130f --- /dev/null +++ b/inc/classes/main/scrypt/class_Scrypt.php @@ -0,0 +1,225 @@ + + * @license http://www.opensource.org/licenses/BSD-2-Clause BSD 2-Clause License + * @link http://github.com/DomBlack/php-scrypt + */ + +/** + * This class abstracts away from scrypt module, allowing for easy use. + * + * You can create a new hash for a password by calling Scrypt:hash($password) + * + * You can check a password by calling Scrypt:check($password, $hash) + * + * @category Security + * @package Scrypt + * @author Dominic Black + * @author Roland Haeder + * @license http://www.opensource.org/licenses/BSD-2-Clause BSD 2-Clause License + * @link http://github.com/DomBlack/php-scrypt + */ +abstract class Scrypt extends BaseFrameworkSystem +{ + + /** + * + * @var int The key length + */ + private static $_keyLength = 32; + + /** + * Get the byte-length of the given string + * + * @param string $str Input string + * + * @return int + */ + protected static function strlen( $str ) { + static $isShadowed = null; + + if ($isShadowed === null) { + $isShadowed = extension_loaded('mbstring') && + ini_get('mbstring.func_overload') & 2; + } + + if ($isShadowed) { + return mb_strlen($str, '8bit'); + } else { + return strlen($str); + } + } + + /** + * Generates a random salt + * + * @param int $length The length of the salt + * + * @return string The salt + */ + public static function generateSalt($length = 8) + { + $buffer = ''; + $buffer_valid = false; + if (function_exists('mcrypt_create_iv') && !defined('PHALANGER')) { + $buffer = mcrypt_create_iv($length, MCRYPT_DEV_URANDOM); + if ($buffer) { + $buffer_valid = true; + } + } + if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) { + $cryptoStrong = false; + $buffer = openssl_random_pseudo_bytes($length, $cryptoStrong); + if ($buffer && $cryptoStrong) { + $buffer_valid = true; + } + } + if (!$buffer_valid && is_readable('/dev/urandom')) { + $f = fopen('/dev/urandom', 'r'); + $read = static::strlen($buffer); + while ($read < $length) { + $buffer .= fread($f, $length - $read); + $read = static::strlen($buffer); + } + fclose($f); + if ($read >= $length) { + $buffer_valid = true; + } + } + if (!$buffer_valid || static::strlen($buffer) < $length) { + $bl = static::strlen($buffer); + for ($i = 0; $i < $length; $i++) { + if ($i < $bl) { + $buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255)); + } else { + $buffer .= chr(mt_rand(0, 255)); + } + } + } + $salt = str_replace(array('+', '$'), array('.', ''), base64_encode($buffer)); + + return $salt; + } + + /** + * Create a password hash + * + * @param string $password The clear text password + * @param string $salt The salt to use, or null to generate a random one + * @param int $N The CPU difficultly (must be a power of 2, > 1) + * @param int $r The memory difficultly + * @param int $p The parallel difficultly + * + * @return string The hashed password + */ + public static function hash($password, $salt = false, $N = 16384, $r = 8, $p = 1) + { + if ($N == 0 || ($N & ($N - 1)) != 0) { + throw new \InvalidArgumentException("N must be > 0 and a power of 2"); + } + + if ($N > PHP_INT_MAX / 128 / $r) { + throw new \InvalidArgumentException("Parameter N is too large"); + } + + if ($r > PHP_INT_MAX / 128 / $p) { + throw new \InvalidArgumentException("Parameter r is too large"); + } + + if ($salt === false) { + $salt = self::generateSalt(); + } else { + // Remove dollar signs from the salt, as we use that as a separator. + $salt = str_replace(array('+', '$'), array('.', ''), base64_encode($salt)); + } + + $hash = scrypt($password, $salt, $N, $r, $p, self::$_keyLength); + + return $N . '$' . $r . '$' . $p . '$' . $salt . '$' . $hash; + } + + /** + * Check a clear text password against a hash + * + * @param string $password The clear text password + * @param string $hash The hashed password + * + * @return boolean If the clear text matches + */ + public static function check($password, $hash) + { + // Is there actually a hash? + if (!$hash) { + return false; + } + + list ($N, $r, $p, $salt, $hash) = explode('$', $hash); + + // No empty fields? + if (empty($N) or empty($r) or empty($p) or empty($salt) or empty($hash)) { + return false; + } + + // Are numeric values numeric? + if (!is_numeric($N) or !is_numeric($r) or !is_numeric($p)) { + return false; + } + + $calculated = scrypt($password, $salt, $N, $r, $p, self::$_keyLength); + + // Use compareStrings to avoid timeing attacks + return self::compareStrings($hash, $calculated); + } + + /** + * Zend Framework (http://framework.zend.com/) + * + * @link http://github.com/zendframework/zf2 for the canonical source repository + * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + * + * Compare two strings to avoid timing attacks + * + * C function memcmp() internally used by PHP, exits as soon as a difference + * is found in the two buffers. That makes possible of leaking + * timing information useful to an attacker attempting to iteratively guess + * the unknown string (e.g. password). + * + * @param string $expected + * @param string $actual + * + * @return boolean If the two strings match. + */ + public static function compareStrings($expected, $actual) + { + $expected = (string) $expected; + $actual = (string) $actual; + $lenExpected = static::strlen($expected); + $lenActual = static::strlen($actual); + $len = min($lenExpected, $lenActual); + + $result = 0; + for ($i = 0; $i < $len; $i ++) { + $result |= ord($expected[$i]) ^ ord($actual[$i]); + } + $result |= $lenExpected ^ $lenActual; + + return ($result === 0); + } +} diff --git a/inc/classes/third_party/scrypt/.htaccess b/inc/classes/third_party/scrypt/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/classes/third_party/scrypt/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/classes/third_party/scrypt/CREDITS b/inc/classes/third_party/scrypt/CREDITS new file mode 100644 index 00000000..79c72e5a --- /dev/null +++ b/inc/classes/third_party/scrypt/CREDITS @@ -0,0 +1,2 @@ +scrypt +Dominic Black \ No newline at end of file diff --git a/inc/classes/third_party/scrypt/LICENSE b/inc/classes/third_party/scrypt/LICENSE new file mode 100644 index 00000000..381d3aff --- /dev/null +++ b/inc/classes/third_party/scrypt/LICENSE @@ -0,0 +1,15 @@ +Original Scrypt Implementation; + Copyright (c) 2009 Colin Percival + +PHP Module; + Copyright (c) 2012, Dominic Black + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/inc/classes/third_party/scrypt/README.md b/inc/classes/third_party/scrypt/README.md new file mode 100644 index 00000000..fef282bd --- /dev/null +++ b/inc/classes/third_party/scrypt/README.md @@ -0,0 +1,90 @@ +PHP scrypt module +================= + +[![Build Status](https://travis-ci.org/DomBlack/php-scrypt.svg?branch=master)](https://travis-ci.org/DomBlack/php-scrypt) + +This is a PHP library providing a wrapper to [Colin Percival's scrypt implementation](http://www.tarsnap.com/scrypt.html). Scrypt is a key derivation function designed to be far more secure against hardware brute-force attacks than alternative functions such as PBKDF2 or bcrypt. + +Details of the scrypt key derivation function are given in a paper by Colin Percival, Stronger Key Derivation via Sequential Memory-Hard Functions: [PDF](http://www.tarsnap.com/scrypt/scrypt-slides.pdf). + +An example class using this module can be found in; scrypt.php + +Join in! +-------- + +We are happy to receive bug reports, fixes, documentation enhancements, and other improvements. + +Please report bugs via the [github issue tracker](http://github.com/DomBlack/php-scrypt/issues). + +Master [git repository](https://github.com/DomBlack/php-scrypt): + + git clone git://github.com/DomBlack/php-scrypt.git + +Authors +------- + +This library is written and maintained by Dominic Black, . + +---- + +PECL Install +============ + +This extension is now avaible through PECL. + +``` +pecl install scrypt +``` + +Build From Source +================= + +Unix/OSX +-------- + +1. `phpize` +2. If on OSX; `export CFLAGS='-arch i386 -arch x86_64'` +3. `./configure --enable-scrypt` +4. `make` +5. `make install` +6. Add the extension to your php.ini + +```` + ; Enable scrypt extension module + extension=scrypt.so +```` + +Windows +------- + +Using Visual Studio 2008 (or Visual C++ Express 2008) open up the attached project +inside the VS2008 folder. This project assumes you have the PHP thread safe source at; +`C:\phpsrcts\`, a PHP install at `C:\php\` and this source code extracted to +`C:\php-scrypt\`. + +1. Build the project. +2. Copy the resultant `scrypt.dll` to your ext directory in PHP. +3. Add the extension to your php.ini + +```` + ; Enable scrypt extension module + extension=scrypt.dll +```` + +Legal Stuff +=========== +This works is licensed under the BSD 2-Clause license. + +Original Scrypt Implementation; + Copyright (c) 2009 Colin Percival + +PHP Module; + Copyright (c) 2012, Dominic Black + +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- 2.30.2