diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..89a5c47c11
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,3 @@
+Please read the project contibuting guidelines before creating an issue of sending in a pull request:
+
+https://github.com/fuel/fuel/wiki/Contributing
diff --git a/base.php b/base.php
index b70b79159b..9d3315a280 100644
--- a/base.php
+++ b/base.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -22,8 +22,12 @@
function import($path, $folder = 'classes')
{
$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
- require_once COREPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php';
-
+ // load it ffrom the core if it exists
+ if (is_file(COREPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php'))
+ {
+ require_once COREPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php';
+ }
+ // if the app has an override (or a non-core file), load that too
if (is_file(APPPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php'))
{
require_once APPPATH.$folder.DIRECTORY_SEPARATOR.$path.'.php';
@@ -126,7 +130,7 @@ function array_to_attr($attr)
$property = $value;
}
- $attr_str .= $property.'="'.$value.'" ';
+ $attr_str .= $property.'="'.str_replace('"', '"', $value).'" ';
}
// We strip off the last space for return
@@ -146,12 +150,31 @@ function array_to_attr($attr)
{
function html_tag($tag, $attr = array(), $content = false)
{
- $has_content = (bool) ($content !== false and $content !== null);
- $html = '<'.$tag;
+ // list of void elements (tags that can not have content)
+ static $void_elements = array(
+ // html4
+ "area","base","br","col","hr","img","input","link","meta","param",
+ // html5
+ "command","embed","keygen","source","track","wbr",
+ // html5.1
+ "menuitem",
+ );
+ // construct the HTML
+ $html = '<'.$tag;
$html .= ( ! empty($attr)) ? ' '.(is_array($attr) ? array_to_attr($attr) : $attr) : '';
- $html .= $has_content ? '>' : ' />';
- $html .= $has_content ? $content.''.$tag.'>' : '';
+
+ // a void element?
+ if (in_array(strtolower($tag), $void_elements))
+ {
+ // these can not have content
+ $html .= ' />';
+ }
+ else
+ {
+ // add the content and close the tag
+ $html .= '>'.$content.''.$tag.'>';
+ }
return $html;
}
diff --git a/bootstrap.php b/bootstrap.php
index 514d9ba1cc..88197689eb 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -42,6 +42,13 @@
// reset the autoloader
\Autoloader::_reset();
+ // if we have sessions loaded, and native session emulation active
+ if (\Config::get('session.native_emulation', false))
+ {
+ // close the name session
+ session_id() and session_write_close();
+ }
+
// make sure we're having an output filter so we can display errors
// occuring before the main config file is loaded
\Config::get('security.output_filter', null) or \Config::set('security.output_filter', 'Security::htmlentities');
@@ -62,6 +69,10 @@
\Cli::beep();
exit(1);
}
+ else
+ {
+ logger(\Fuel::L_ERROR, 'shutdown - ' . $e->getMessage()." in ".$e->getFile()." on ".$e->getLine());
+ }
}
return \Error::shutdown_handler();
});
@@ -124,6 +135,7 @@ function setup_autoloader()
'Fuel\\Core\\Cache_Storage_File' => COREPATH.'classes/cache/storage/file.php',
'Fuel\\Core\\Cache_Storage_Memcached' => COREPATH.'classes/cache/storage/memcached.php',
'Fuel\\Core\\Cache_Storage_Redis' => COREPATH.'classes/cache/storage/redis.php',
+ 'Fuel\\Core\\Cache_Storage_Xcache' => COREPATH.'classes/cache/storage/xcache.php',
'Fuel\\Core\\Config' => COREPATH.'classes/config.php',
'Fuel\\Core\\ConfigException' => COREPATH.'classes/config.php',
@@ -251,6 +263,8 @@ function setup_autoloader()
'Fuel\\Core\\Pagination' => COREPATH.'classes/pagination.php',
+ 'Fuel\\Core\\Presenter' => COREPATH.'classes/presenter.php',
+
'Fuel\\Core\\Profiler' => COREPATH.'classes/profiler.php',
'Fuel\\Core\\Request' => COREPATH.'classes/request.php',
@@ -301,6 +315,6 @@ function setup_autoloader()
'Fuel\\Core\\Validation_Error' => COREPATH.'classes/validation/error.php',
'Fuel\\Core\\View' => COREPATH.'classes/view.php',
- 'Fuel\\Core\\ViewModel' => COREPATH.'classes/viewmodel.php',
+ 'Fuel\\Core\\Viewmodel' => COREPATH.'classes/viewmodel.php',
));
};
diff --git a/bootstrap_phpunit.php b/bootstrap_phpunit.php
index 3b5b851300..dd4ff62e1f 100644
--- a/bootstrap_phpunit.php
+++ b/bootstrap_phpunit.php
@@ -32,6 +32,41 @@
defined('FUEL_START_TIME') or define('FUEL_START_TIME', microtime(true));
defined('FUEL_START_MEM') or define('FUEL_START_MEM', memory_get_usage());
+// Load the Composer autoloader if present
+defined('VENDORPATH') or define('VENDORPATH', realpath(COREPATH.'..'.DS.'vendor').DS);
+if ( ! is_file(VENDORPATH.'autoload.php'))
+{
+ die('Composer is not installed. Please run "php composer.phar update" in the project root to install Composer');
+}
+require VENDORPATH.'autoload.php';
+
+if (class_exists('AspectMock\Kernel'))
+{
+ // Configure AspectMock
+ $kernel = \AspectMock\Kernel::getInstance();
+ $kernel->init(array(
+ 'debug' => true,
+ 'appDir' => __DIR__.'/../',
+ 'includePaths' => array(
+ APPPATH, COREPATH, PKGPATH,
+ ),
+ 'excludePaths' => array(
+ APPPATH.'tests', COREPATH.'tests',
+ ),
+ 'cacheDir' => APPPATH.'tmp/AspectMock',
+ ));
+
+ // Load in the Fuel autoloader
+ $kernel->loadFile(COREPATH.'classes'.DIRECTORY_SEPARATOR.'autoloader.php');
+}
+else
+{
+ // Load in the Fuel autoloader
+ require COREPATH.'classes'.DIRECTORY_SEPARATOR.'autoloader.php';
+}
+
+class_alias('Fuel\\Core\\Autoloader', 'Autoloader');
+
// Boot the app
require_once APPPATH.'bootstrap.php';
diff --git a/classes/agent.php b/classes/agent.php
index cce9827a94..46ba5e6afd 100644
--- a/classes/agent.php
+++ b/classes/agent.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -96,7 +96,7 @@ class Agent
protected static $defaults = array(
'browscap' => array(
'enabled' => true,
- 'url' => 'http://tempdownloads.browserscap.com/stream.asp?Lite_PHP_BrowsCapINI',
+ 'url' => 'http://browscap.org/stream?q=Lite_PHP_BrowsCapINI',
'method' => 'wrapper',
'file' => '',
),
@@ -193,7 +193,7 @@ public static function _init()
if (static::$user_agent)
{
// try the build in get_browser() method
- if (ini_get('browscap') == '' or false === $browser = get_browser(null, true))
+ if (ini_get('browscap') == '' or false === $browser = get_browser(static::$user_agent, true))
{
// if it fails, emulate get_browser()
$browser = static::get_from_browscap();
@@ -424,7 +424,7 @@ protected static function parse_browscap()
case 'local':
if ( ! is_file(static::$config['browscap']['file']) or filesize(static::$config['browscap']['file']) == 0)
{
- throw new \Exception('Agent class: could not open the local browscap.ini file.');
+ throw new \Exception('Agent class: could not open the local browscap.ini file: '.static::$config['browscap']['file']);
}
$data = @file_get_contents(static::$config['browscap']['file']);
break;
@@ -456,6 +456,7 @@ protected static function parse_browscap()
}
catch (\ErrorException $e)
{
+ logger(\Fuel::L_ERROR, 'Failed to download browscap.ini file.', 'Agent::parse_browscap');
$data = false;
}
default:
@@ -475,7 +476,7 @@ protected static function parse_browscap()
}
catch (\Exception $e)
{
- logger(\Fuel::L_ERROR, 'Failed to download browscap.ini file.', 'Agent::parse_browscap');
+ logger(\Fuel::L_ERROR, 'Failed to get the cache of browscap.ini file.', 'Agent::parse_browscap');
}
}
else
diff --git a/classes/arr.php b/classes/arr.php
index 0ea5dde890..a68d0975ec 100644
--- a/classes/arr.php
+++ b/classes/arr.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -53,6 +53,8 @@ public static function get($array, $key, $default = null)
return $return;
}
+ is_object($key) and $key = (string) $key;
+
if (array_key_exists($key, $array))
{
return $array[$key];
@@ -247,6 +249,34 @@ public static function assoc_to_keyval($assoc, $key_field, $val_field)
return $output;
}
+ /**
+ * Converts an array of key => values into a multi-dimensional associative array with the provided field names
+ *
+ * @param array $array the array to convert
+ * @param string $key_field the field name of the key field
+ * @param string $val_field the field name of the value field
+ * @return array
+ * @throws \InvalidArgumentException
+ */
+ public static function keyval_to_assoc($array, $key_field, $val_field)
+ {
+ if ( ! is_array($array) and ! $array instanceof \Iterator)
+ {
+ throw new \InvalidArgumentException('The first parameter must be an array.');
+ }
+
+ $output = array();
+ foreach ($array as $key => $value)
+ {
+ $output[] = array(
+ $key_field => $key,
+ $val_field => $value
+ );
+ }
+
+ return $output;
+ }
+
/**
* Converts the given 1 dimensional non-associative array to an associative
* array.
diff --git a/classes/asset.php b/classes/asset.php
index 799de4a0d3..5d72831785 100644
--- a/classes/asset.php
+++ b/classes/asset.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/asset/instance.php b/classes/asset/instance.php
index 5136768b3a..c3a8444be1 100644
--- a/classes/asset/instance.php
+++ b/classes/asset/instance.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -74,6 +74,11 @@ class Asset_Instance
*/
protected $_fail_silently = false;
+ /**
+ * @var bool if true, will always true to resolve assets. if false, it will only try to resolve if the asset url is relative.
+ */
+ protected $_always_resolve = false;
+
/**
* Parse the config and initialize the object instance
*
@@ -103,11 +108,12 @@ public function __construct($config)
}
}
- $this->_add_mtime = $config['add_mtime'];
+ $this->_add_mtime = (bool) $config['add_mtime'];
$this->_asset_url = $config['url'];
$this->_indent = str_repeat($config['indent_with'], $config['indent_level']);
- $this->_auto_render = $config['auto_render'];
- $this->_fail_silently = $config['fail_silently'];
+ $this->_auto_render = (bool) $config['auto_render'];
+ $this->_fail_silently = (bool) $config['fail_silently'];
+ $this->_always_resolve = (bool) $config['always_resolve'];
}
/**
@@ -235,10 +241,10 @@ public function render($group = null, $raw = false)
$inline = $item['raw'];
// only do a file search if the asset is not a URI
- if ( ! preg_match('|^(\w+:)?//|', $filename))
+ if ($this->_always_resolve or ! preg_match('|^(\w+:)?//|', $filename))
{
// and only if the asset is local to the applications base_url
- if ( ! preg_match('|^(\w+:)?//|', $this->_asset_url) or strpos($this->_asset_url, \Config::get('base_url')) === 0)
+ if ($this->_always_resolve or ! preg_match('|^(\w+:)?//|', $this->_asset_url) or strpos($this->_asset_url, \Config::get('base_url')) === 0)
{
if ( ! ($file = $this->find_file($filename, $type)))
{
@@ -266,6 +272,7 @@ public function render($group = null, $raw = false)
else
{
$file = $this->_asset_url.$file.($this->_add_mtime ? '?'.filemtime($file) : '');
+ $file = str_replace(str_replace(DS, '/', DOCROOT), '', $file);
}
}
}
@@ -277,6 +284,10 @@ public function render($group = null, $raw = false)
$file = file_get_contents($file);
$inline = true;
}
+ else
+ {
+ $file = str_replace(str_replace(DS, '/', DOCROOT), '', $file);
+ }
}
}
else
@@ -461,8 +472,6 @@ public function find_file($file, $type, $folder = '')
if (is_file($newfile = $path.$folder.$this->_unify_path($file, null, false)))
{
- strpos($newfile, DOCROOT) === 0 and $newfile = substr($newfile, strlen(DOCROOT));
-
// return the file found, make sure it uses forward slashes on Windows
return str_replace(DS, '/', $newfile);
}
diff --git a/classes/autoloader.php b/classes/autoloader.php
index 1020ec59cd..246941ee5a 100644
--- a/classes/autoloader.php
+++ b/classes/autoloader.php
@@ -6,14 +6,14 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
namespace Fuel\Core;
/**
- * The Autloader is responsible for all class loading. It allows you to define
+ * The Autoloader is responsible for all class loading. It allows you to define
* different load paths based on namespaces. It also lets you set explicit paths
* for classes to be loaded from.
*
@@ -120,7 +120,7 @@ public static function namespace_path($namespace)
*/
public static function add_class($class, $path)
{
- static::$classes[$class] = $path;
+ static::$classes[strtolower($class)] = $path;
}
/**
@@ -133,7 +133,7 @@ public static function add_classes($classes)
{
foreach ($classes as $class => $path)
{
- static::$classes[$class] = $path;
+ static::$classes[strtolower($class)] = $path;
}
}
@@ -177,7 +177,7 @@ protected static function find_core_class($class)
{
foreach (static::$core_namespaces as $ns)
{
- if (array_key_exists($ns_class = $ns.'\\'.$class, static::$classes))
+ if (array_key_exists(strtolower($ns_class = $ns.'\\'.$class), static::$classes))
{
return $ns_class;
}
@@ -231,19 +231,21 @@ public static function load($class)
static::$auto_initialize = $class;
}
- if (isset(static::$classes[$class]))
+ if (isset(static::$classes[strtolower($class)]))
{
- include str_replace('/', DS, static::$classes[$class]);
- static::init_class($class);
+ static::init_class($class, str_replace('/', DS, static::$classes[strtolower($class)]));
$loaded = true;
}
elseif ($full_class = static::find_core_class($class))
{
if ( ! class_exists($full_class, false) and ! interface_exists($full_class, false))
{
- include static::prep_path(static::$classes[$full_class]);
+ include static::prep_path(static::$classes[strtolower($full_class)]);
+ }
+ if ( ! class_exists($class, false))
+ {
+ class_alias($full_class, $class);
}
- class_alias($full_class, $class);
static::init_class($class);
$loaded = true;
}
@@ -264,8 +266,7 @@ class_alias($full_class, $class);
);
if (is_file($path))
{
- require $path;
- static::init_class($class);
+ static::init_class($class, $path);
$loaded = true;
break;
}
@@ -279,8 +280,7 @@ class_alias($full_class, $class);
if (is_file($path))
{
- include $path;
- static::init_class($class);
+ static::init_class($class, $path);
$loaded = true;
}
}
@@ -353,16 +353,50 @@ protected static function prep_path($path)
* it calls it.
*
* @param string the class name
+ * @param string the file containing the class to include
*/
- protected static function init_class($class)
+ protected static function init_class($class, $file = null)
{
- if (static::$auto_initialize === $class)
+ // include the file if needed
+ if ($file)
{
- static::$auto_initialize = null;
- if (method_exists($class, '_init') and is_callable($class.'::_init'))
+ include $file;
+ }
+
+ // if the loaded file contains a class...
+ if (class_exists($class, false))
+ {
+ // call the classes static init if needed
+ if (static::$auto_initialize === $class)
{
- call_user_func($class.'::_init');
+ static::$auto_initialize = null;
+ if (method_exists($class, '_init') and is_callable($class.'::_init'))
+ {
+ call_user_func($class.'::_init');
+ }
}
}
+
+ // or an interface...
+ elseif (interface_exists($class, false))
+ {
+ // nothing to do here
+ }
+
+ // or a trait if you're not on 5.3 anymore...
+ elseif (function_exists('trait_exists') and trait_exists($class, false))
+ {
+ // nothing to do here
+ }
+
+ // else something went wrong somewhere, barf and exit now
+ elseif ($file)
+ {
+ throw new \Exception('File "'.\Fuel::clean_path($file).'" does not contain class "'.$class.'"');
+ }
+ else
+ {
+ throw new \FuelException('Class "'.$class.'" is not defined');
+ }
}
}
diff --git a/classes/cache.php b/classes/cache.php
index 696d3858f8..d249e2093e 100644
--- a/classes/cache.php
+++ b/classes/cache.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/handler/driver.php b/classes/cache/handler/driver.php
index 09fe70d820..ae74dc8e9d 100644
--- a/classes/cache/handler/driver.php
+++ b/classes/cache/handler/driver.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/handler/json.php b/classes/cache/handler/json.php
index c1434c481d..72909d945d 100644
--- a/classes/cache/handler/json.php
+++ b/classes/cache/handler/json.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/handler/serialized.php b/classes/cache/handler/serialized.php
index 99ac6265a5..6f70a8d6e1 100644
--- a/classes/cache/handler/serialized.php
+++ b/classes/cache/handler/serialized.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/handler/string.php b/classes/cache/handler/string.php
index 44a51c383f..cbaeb0f77a 100644
--- a/classes/cache/handler/string.php
+++ b/classes/cache/handler/string.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/notfound.php b/classes/cache/notfound.php
index 690d3b03a6..4ee8ac5ca2 100644
--- a/classes/cache/notfound.php
+++ b/classes/cache/notfound.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/storage/apc.php b/classes/cache/storage/apc.php
index 5efe063c1b..f465a35793 100644
--- a/classes/cache/storage/apc.php
+++ b/classes/cache/storage/apc.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/storage/driver.php b/classes/cache/storage/driver.php
index 3ce6363cfc..851a90e80e 100644
--- a/classes/cache/storage/driver.php
+++ b/classes/cache/storage/driver.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/storage/file.php b/classes/cache/storage/file.php
index 0a0ed8c359..33a5a63400 100644
--- a/classes/cache/storage/file.php
+++ b/classes/cache/storage/file.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -319,7 +319,7 @@ protected function _get()
{
$id_path = $this->identifier_to_path( $this->identifier );
$file = static::$path.$id_path.'.cache';
- if ( ! is_file($file))
+ if ( ! is_file($file) or ($size = filesize($file)) == 0)
{
return false;
}
@@ -334,7 +334,7 @@ protected function _get()
while( ! flock($handle, LOCK_SH));
// read the session data
- $payload = fread($handle, filesize($file));
+ $payload = fread($handle, $size);
//release the lock
flock($handle, LOCK_UN);
diff --git a/classes/cache/storage/memcached.php b/classes/cache/storage/memcached.php
index 16c0ea6379..d80ff85160 100644
--- a/classes/cache/storage/memcached.php
+++ b/classes/cache/storage/memcached.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/storage/redis.php b/classes/cache/storage/redis.php
index 637bc5d418..273e7e95ba 100644
--- a/classes/cache/storage/redis.php
+++ b/classes/cache/storage/redis.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cache/storage/xcache.php b/classes/cache/storage/xcache.php
new file mode 100644
index 0000000000..4098cbfad4
--- /dev/null
+++ b/classes/cache/storage/xcache.php
@@ -0,0 +1,385 @@
+config = isset($config['xcache']) ? $config['xcache'] : array();
+
+ // make sure we have an id
+ $this->config['cache_id'] = $this->_validate_config('cache_id', isset($this->config['cache_id'])
+ ? $this->config['cache_id'] : 'fuel');
+
+ // check for an expiration override
+ $this->expiration = $this->_validate_config('expiration', isset($this->config['expiration'])
+ ? $this->config['expiration'] : $this->expiration);
+
+ // do we have the PHP XCache extension available
+ if ( ! function_exists('xcache_set') )
+ {
+ throw new \FuelException('Your PHP installation doesn\'t have XCache loaded.');
+ }
+ }
+
+ // ---------------------------------------------------------------------
+
+ /**
+ * Check if other caches or files have been changed since cache creation
+ *
+ * @param array
+ * @return bool
+ */
+ public function check_dependencies(array $dependencies)
+ {
+ foreach($dependencies as $dep)
+ {
+ // get the section name and identifier
+ $sections = explode('.', $dep);
+ if (count($sections) > 1)
+ {
+ $identifier = array_pop($sections);
+ $sections = '.'.implode('.', $sections);
+
+ }
+ else
+ {
+ $identifier = $dep;
+ $sections = '';
+ }
+
+ // get the cache index
+ $index = xcache_get($this->config['cache_id'].$sections);
+
+ // get the key from the index
+ $key = isset($index[$identifier][0]) ? $index[$identifier] : false;
+
+ // key found and newer?
+ if ($key === false or $key[1] > $this->created)
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Delete Cache
+ */
+ public function delete()
+ {
+ // get the XCache key for the cache identifier
+ $key = $this->_get_key(true);
+
+ // delete the key from the xcache store
+ $key and xcache_unset($key);
+
+ $this->reset();
+ }
+
+ /**
+ * Purge all caches
+ *
+ * @param limit purge to subsection
+ * @return bool
+ */
+ public function delete_all($section)
+ {
+ // determine the section index name
+ $section = $this->config['cache_id'].(empty($section)?'':'.'.$section);
+
+ // get the directory index
+ $index = xcache_get($this->config['cache_id'].'__DIR__');
+
+ if (is_array($index))
+ {
+ // limit the delete if we have a valid section
+ if ( ! empty($section))
+ {
+ $dirs = in_array($section, $index) ? array($section) : array();
+ }
+ else
+ {
+ $dirs = $index;
+ }
+
+ // loop through the indexes, delete all stored keys, then delete the indexes
+ foreach ($dirs as $dir)
+ {
+ $list = xcache_get($dir);
+ foreach ($list as $item)
+ {
+ xcache_unset($item[0]);
+ }
+ xcache_unset($dir);
+ }
+
+ // update the directory index
+ $index = array_diff($index, $dirs);
+ xcache_set($this->config['cache_id'].'__DIR__', $index);
+ }
+ }
+
+ // ---------------------------------------------------------------------
+
+ /**
+ * Prepend the cache properties
+ *
+ * @return string
+ */
+ protected function prep_contents()
+ {
+ $properties = array(
+ 'created' => $this->created,
+ 'expiration' => $this->expiration,
+ 'dependencies' => $this->dependencies,
+ 'content_handler' => $this->content_handler
+ );
+ $properties = '{{'.static::PROPS_TAG.'}}'.json_encode($properties).'{{/'.static::PROPS_TAG.'}}';
+
+ return $properties.$this->contents;
+ }
+
+ /**
+ * Remove the prepended cache properties and save them in class properties
+ *
+ * @param string
+ * @throws UnexpectedValueException
+ */
+ protected function unprep_contents($payload)
+ {
+ $properties_end = strpos($payload, '{{/'.static::PROPS_TAG.'}}');
+ if ($properties_end === FALSE)
+ {
+ throw new \UnexpectedValueException('Cache has bad formatting');
+ }
+
+ $this->contents = substr($payload, $properties_end + strlen('{{/'.static::PROPS_TAG.'}}'));
+ $props = substr(substr($payload, 0, $properties_end), strlen('{{'.static::PROPS_TAG.'}}'));
+ $props = json_decode($props, true);
+ if ($props === NULL)
+ {
+ throw new \UnexpectedValueException('Cache properties retrieval failed');
+ }
+
+ $this->created = $props['created'];
+ $this->expiration = is_null($props['expiration']) ? null : (int) ($props['expiration'] - time());
+ $this->dependencies = $props['dependencies'];
+ $this->content_handler = $props['content_handler'];
+ }
+
+ /**
+ * Save a cache, this does the generic pre-processing
+ *
+ * @return bool success
+ */
+ protected function _set()
+ {
+ // get the xcache key for the cache identifier
+ $key = $this->_get_key();
+
+ $payload = $this->prep_contents();
+
+ // adjust the expiration, xcache uses a TTL instead of a timestamp
+ $expiration = is_null($this->expiration) ? 0 : (int) ($this->expiration - $this->created);
+
+ // write it to the xcache store
+ if (xcache_set($key, $payload, $expiration) === false)
+ {
+ throw new \RuntimeException('Xcache returned failed to write. Check your configuration.');
+ }
+
+ // update the index
+ $this->_update_index($key);
+
+ return true;
+ }
+
+ /**
+ * Load a cache, this does the generic post-processing
+ *
+ * @return bool success
+ */
+ protected function _get()
+ {
+ // get the xcache key for the cache identifier
+ $key = $this->_get_key();
+
+ // fetch the cached data from the xcache store
+ $payload = xcache_get($key);
+
+ try
+ {
+ $this->unprep_contents($payload);
+ }
+ catch (\UnexpectedValueException $e)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * validate a driver config value
+ *
+ * @param string name of the config variable to validate
+ * @param mixed value
+ * @return mixed
+ */
+ private function _validate_config($name, $value)
+ {
+ switch ($name)
+ {
+ case 'cache_id':
+ if (empty($value) or ! is_string($value))
+ {
+ $value = 'fuel';
+ }
+ break;
+
+ case 'expiration':
+ if (empty($value) or ! is_numeric($value))
+ {
+ $value = null;
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return $value;
+ }
+
+ /**
+ * get's the xcache key belonging to the cache identifier
+ *
+ * @param bool if true, remove the key retrieved from the index
+ * @return string
+ */
+ protected function _get_key($remove = false)
+ {
+ // get the current index information
+ list($identifier, $sections, $index) = $this->_get_index();
+
+ // get the key from the index
+ $key = isset($index[$identifier][0]) ? $index[$identifier][0] : false;
+
+ if ($remove === true)
+ {
+ if ( $key !== false )
+ {
+ unset($index[$identifier]);
+ xcache_set($this->config['cache_id'].$sections, $index);
+ }
+ }
+ else
+ {
+ // create a new key if needed
+ $key === false and $key = $this->_new_key();
+ }
+
+ return $key;
+ }
+
+ /**
+ * generate a new unique key for the current identifier
+ *
+ * @return string
+ */
+ protected function _new_key()
+ {
+ $key = '';
+ while (strlen($key) < 32)
+ {
+ $key .= mt_rand(0, mt_getrandmax());
+ }
+ return md5($this->config['cache_id'].'_'.uniqid($key, TRUE));
+ }
+
+ /**
+ * Get the section index
+ *
+ * @return array containing the identifier, the sections, and the section index
+ */
+ protected function _get_index()
+ {
+ // get the section name and identifier
+ $sections = explode('.', $this->identifier);
+ if (count($sections) > 1)
+ {
+ $identifier = array_pop($sections);
+ $sections = '.'.implode('.', $sections);
+ }
+ else
+ {
+ $identifier = $this->identifier;
+ $sections = '';
+ }
+
+ // get the cache index and return it
+ return array($identifier, $sections, xcache_get($this->config['cache_id'].$sections));
+ }
+
+ /**
+ * Update the section index
+ *
+ * @param string cache key
+ */
+ protected function _update_index($key)
+ {
+ // get the current index information
+ list($identifier, $sections, $index) = $this->_get_index();
+
+ // store the key in the index and write the index back
+ $index[$identifier] = array($key, $this->created);
+ xcache_set($this->config['cache_id'].$sections, array_merge($index, array($identifier => array($key,$this->created))));
+
+ // get the directory index
+ $index = xcache_get($this->config['cache_id'].'__DIR__');
+
+ if (is_array($index))
+ {
+ if (!in_array($this->config['cache_id'].$sections, $index))
+ {
+ $index[] = $this->config['cache_id'].$sections;
+ }
+ }
+ else
+ {
+ $index = array($this->config['cache_id'].$sections);
+ }
+
+ // update the directory index
+ xcache_set($this->config['cache_id'].'__DIR__', $index, 0);
+ }
+}
diff --git a/classes/cli.php b/classes/cli.php
index 9d43d1e1ff..93fbc791a7 100644
--- a/classes/cli.php
+++ b/classes/cli.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -29,6 +29,8 @@ class Cli
public static $wait_msg = 'Press any key to continue...';
+ public static $nocolor = false;
+
protected static $args = array();
protected static $foreground_colors = array(
@@ -62,6 +64,9 @@ class Cli
'light_gray' => '47',
);
+ protected static $STDOUT;
+ protected static $STDERR;
+
/**
* Static constructor. Parses all the CLI params.
*/
@@ -86,6 +91,9 @@ public static function _init()
// Readline is an extension for PHP that makes interactive with PHP much more bash-like
// http://www.php.net/manual/en/readline.installation.php
static::$readline_support = extension_loaded('readline');
+
+ static::$STDERR = STDERR;
+ static::$STDOUT = STDOUT;
}
/**
@@ -240,7 +248,7 @@ public static function prompt()
$extra_output = ' [ '.implode(', ', $options).' ]';
}
- fwrite(STDOUT, $output.$extra_output.': ');
+ fwrite(static::$STDOUT, $output.$extra_output.': ');
}
// Read the input from keyboard.
@@ -285,7 +293,7 @@ public static function write($text = '', $foreground = null, $background = null)
$text = static::color($text, $foreground, $background);
}
- fwrite(STDOUT, $text.PHP_EOL);
+ fwrite(static::$STDOUT, $text.PHP_EOL);
}
/**
@@ -305,7 +313,7 @@ public static function error($text = '', $foreground = 'light_red', $background
$text = static::color($text, $foreground, $background);
}
- fwrite(STDERR, $text.PHP_EOL);
+ fwrite(static::$STDERR, $text.PHP_EOL);
}
/**
@@ -333,7 +341,7 @@ public static function wait($seconds = 0, $countdown = false)
while ($time > 0)
{
- fwrite(STDOUT, $time.'... ');
+ fwrite(static::$STDOUT, $time.'... ');
sleep(1);
$time--;
}
@@ -391,7 +399,7 @@ public static function clear_screen()
? static::new_line(40)
// Anything with a flair of Unix will handle these magic characters
- : fwrite(STDOUT, chr(27)."[H".chr(27)."[2J");
+ : fwrite(static::$STDOUT, chr(27)."[H".chr(27)."[2J");
}
/**
@@ -411,6 +419,11 @@ public static function color($text, $foreground, $background = null, $format=nul
return $text;
}
+ if (static::$nocolor)
+ {
+ return $text;
+ }
+
if ( ! array_key_exists($foreground, static::$foreground_colors))
{
throw new \FuelException('Invalid CLI foreground color: '.$foreground);
@@ -462,5 +475,54 @@ public static function spawn($call, $output = '/dev/null')
}
}
+ /**
+ * Redirect STDERR writes to this file or fh
+ *
+ * Call with no argument to retrieve the current filehandle.
+ *
+ * Is not smart about opening the file if it's a string. Existing files will be truncated.
+ *
+ * @param resource|string $fh Opened filehandle or string filename.
+ *
+ * @return resource
+ */
+ public static function stderr($fh = null)
+ {
+ $orig = static::$STDERR;
+
+ if (! is_null($fh)) {
+ if (is_string($fh)) {
+ $fh = fopen($fh, "w");
+ }
+ static::$STDERR = $fh;
+ }
+
+ return $orig;
+ }
+
+ /**
+ * Redirect STDOUT writes to this file or fh
+ *
+ * Call with no argument to retrieve the current filehandle.
+ *
+ * Is not smart about opening the file if it's a string. Existing files will be truncated.
+ *
+ * @param resource|string|null $fh Opened filehandle or string filename.
+ *
+ * @return resource
+ */
+ public static function stdout($fh = null)
+ {
+ $orig = static::$STDOUT;
+
+ if (! is_null($fh)) {
+ if (is_string($fh)) {
+ $fh = fopen($fh, "w");
+ }
+ static::$STDOUT = $fh;
+ }
+
+ return $orig;
+ }
}
diff --git a/classes/config.php b/classes/config.php
index da7764eb18..c51403493c 100644
--- a/classes/config.php
+++ b/classes/config.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -197,6 +197,11 @@ public static function get($item, $default = null)
return $default;
}
+ if ( ! is_scalar($val))
+ {
+ return $val;
+ }
+
static::$itemcache[$item] = $val;
}
diff --git a/classes/config/file.php b/classes/config/file.php
index a3d0a2fb59..b9c8fdbd17 100644
--- a/classes/config/file.php
+++ b/classes/config/file.php
@@ -164,7 +164,7 @@ public function save($contents)
$this->file = substr($this->file, $pos+2);
// strip the classes directory as we need the module root
- $path = substr($path,0, -8).'config'.DS.$this->file;
+ $path = substr($path,0, -8).'config'.DS.$this->file.$this->ext;
}
else
{
@@ -189,7 +189,24 @@ public function save($contents)
mkdir($path['dirname'], 0777, true);
}
- return \File::update($path['dirname'], $path['basename'], $output);
+ $return = \File::update($path['dirname'], $path['basename'], $output);
+ if ($return)
+ {
+ try
+ {
+ \Config::load('file', true);
+ chmod($path['dirname'].DS.$path['basename'], \Config::get('file.chmod.files', 0666));
+ }
+ catch (\PhpErrorException $e)
+ {
+ // if we get something else then a chmod error, bail out
+ if (substr($e->getMessage(),0,8) !== 'chmod():')
+ {
+ throw new $e;
+ }
+ }
+ }
+ return $return;
}
/**
diff --git a/classes/config/php.php b/classes/config/php.php
index 94c0ae0f68..33cf74615e 100644
--- a/classes/config/php.php
+++ b/classes/config/php.php
@@ -7,8 +7,75 @@
*/
class Config_Php extends \Config_File
{
+ /**
+ * @var bool whether or not opcache is in use
+ */
+ protected static $uses_opcache = false;
+
+ /**
+ * @var bool whether or not APC is in use
+ */
+ protected static $uses_apc = false;
+
+ /**
+ * @var bool whether or not we need to flush the opcode cache after a save
+ */
+ protected static $flush_needed = false;
+
+ /**
+ * check the status of any opcache mechanism in use
+ */
+ public static function _init()
+ {
+ // do we have Opcache active?
+ static::$uses_opcache = (PHP_VERSION_ID >= 50500 and function_exists('opcache_invalidate'));
+
+ // do we have APC active?
+ static::$uses_apc = function_exists('apc_compile_file');
+
+ // determine if we have an opcode cache active
+ static::$flush_needed = static::$uses_opcache or static::$uses_apc;
+ }
+
+ /**
+ * @var string the extension used by this config file parser
+ */
protected $ext = '.php';
+ /**
+ * Formats the output and saved it to disk.
+ *
+ * @param $contents $contents config array to save
+ * @return bool \File::update result
+ */
+ public function save($contents)
+ {
+ // store the current filename
+ $file = $this->file;
+
+ // save it
+ $return = parent::save($contents);
+
+ // existing file? saved? and do we need to flush the opcode cache?
+ if ($file == $this->file and $return and static::$flush_needed)
+ {
+ if ($this->file[0] !== '/' and ( ! isset($this->file[1]) or $this->file[1] !== ':'))
+ {
+ // locate the file
+ $file = \Finder::search('config', $this->file, $this->ext);
+ }
+
+ // make sure we have a fallback
+ $file or $file = APPPATH.'config'.DS.$this->file.$this->ext;
+
+ // flush the opcode caches that are active
+ static::$uses_opcache and opcache_invalidate($file, true);
+ static::$uses_apc and apc_compile_file($file);
+ }
+
+ return $return;
+ }
+
/**
* Loads in the given file and parses it.
*
@@ -32,7 +99,7 @@ protected function export_format($contents)
to_json($response, true);
+ }
+
+ // and make sure we have a valid Response object
if ( ! $response instanceof Response)
{
$response = \Response::forge($response, $this->response_status);
diff --git a/classes/controller/rest.php b/classes/controller/rest.php
index a0a3aa02fe..6ba98efcd6 100644
--- a/classes/controller/rest.php
+++ b/classes/controller/rest.php
@@ -181,11 +181,11 @@ protected function response($data = array(), $http_status = null)
$this->response->set_header('Content-Type', $this->_supported_formats[$this->format]);
}
- // no data returned? Set the NO CONTENT status on the response
+ // no data returned?
if ((is_array($data) and empty($data)) or ($data == ''))
{
- $this->response->status = $this->no_data_status;
- return $this->response;
+ // override the http status with the NO CONTENT status
+ $http_status = $this->no_data_status;
}
// make sure we have a valid return status
@@ -211,19 +211,19 @@ protected function response($data = array(), $http_status = null)
}
}
- // Format not supported, but the output is an array
- elseif (is_array($data))
+ // Format not supported, but the output is an array or an object that can not be cast to string
+ elseif (is_array($data) or (is_object($data) and ! method_exists($data, '__toString')))
{
if (\Fuel::$env == \Fuel::PRODUCTION)
{
// not acceptable in production
$http_status = 406;
- $this->response->body('The requested REST method returned array, which is not compatible with the output format "'.$this->format.'"');
+ $this->response->body('The requested REST method returned an array or object, which is not compatible with the output format "'.$this->format.'"');
}
else
{
// convert it to json so we can at least read it while we're developing
- $this->response->body('The requested REST method returned an array: '.$text.'
'.\Format::forge($data)->to_json(null, true));
+ $this->response->body('The requested REST method returned an array or object:
'.\Format::forge($data)->to_json(null, true));
}
}
@@ -259,6 +259,12 @@ protected function http_status($status)
*/
protected function _detect_format()
{
+ // A format has been passed as a named parameter in the route
+ if ($this->param('format') and array_key_exists($this->param('format'), $this->_supported_formats))
+ {
+ return $this->param('format');
+ }
+
// A format has been passed as an argument in the URL and it is supported
if (\Input::param('format') and array_key_exists(\Input::param('format'), $this->_supported_formats))
{
@@ -429,7 +435,9 @@ protected function _prepare_basic_auth()
protected function _prepare_digest_auth()
{
- $uniqid = uniqid(""); // Empty argument for backward compatibility
+ // Empty argument for backward compatibility
+ $uniqid = uniqid("");
+
// We need to test which server authentication variable to use
// because the PHP ISAPI module in IIS acts different from CGI
if (\Input::server('PHP_AUTH_DIGEST'))
@@ -445,25 +453,32 @@ protected function _prepare_digest_auth()
$digest_string = '';
}
- /* The $_SESSION['error_prompted'] variabile is used to ask
- the password again if none given or if the user enters
- a wrong auth. informations. */
+ // Prompt for authentication if we don't have a digest string
if (empty($digest_string))
{
static::_force_login($uniqid);
return false;
}
- // We need to retrieve authentication informations from the $auth_data variable
- preg_match_all('@(username|nonce|uri|nc|cnonce|qop|response)=[\'"]?([^\'",]+)@', $digest_string, $matches);
- $digest = array_combine($matches[1], $matches[2]);
+ // We need to retrieve authentication informations from the $digest_string variable
+ $digest_params = explode(', ', $digest_string);
+ foreach ($digest_params as $digest_param)
+ {
+ $digest_param = explode('=', $digest_param, 2);
+ if (isset($digest_param[1]))
+ {
+ $digest[$digest_param[0]] = trim($digest_param[1], '"');
+ }
+ }
+ // if no username, or an invalid username found, re-authenticate
if ( ! array_key_exists('username', $digest) or ! static::_check_login($digest['username']))
{
static::_force_login($uniqid);
return false;
}
+ // validate the configured login/password
$valid_logins = \Config::get('rest.valid_logins');
$valid_pass = $valid_logins[$digest['username']];
diff --git a/classes/controller/template.php b/classes/controller/template.php
index 1de066183f..53a428d3f0 100644
--- a/classes/controller/template.php
+++ b/classes/controller/template.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/cookie.php b/classes/cookie.php
index 60c9f67e58..239e0aaf6e 100644
--- a/classes/cookie.php
+++ b/classes/cookie.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -29,7 +29,7 @@ class Cookie
/**
* @var array Cookie class configuration defaults
*/
- private static $config = array(
+ protected static $config = array(
'expiration' => 0,
'path' => '/',
'domain' => null,
diff --git a/classes/crypt.php b/classes/crypt.php
index ad6291b966..813692b86b 100644
--- a/classes/crypt.php
+++ b/classes/crypt.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -70,13 +70,9 @@ public static function _init()
// update the config if needed
if ($update === true)
{
- // load the file config
- \Config::load('file', true);
-
try
{
\Config::save('crypt', static::$config);
- chmod(APPPATH.'config'.DS.'crypt.php', \Config::get('file.chmod.files', 0666));
}
catch (\FileAccessException $e)
{
@@ -194,7 +190,7 @@ private static function secure_compare($a, $b)
{
$result |= ord($a[$i]) ^ ord($b[$i]);
}
- return $result == 0;
+ return $result === 0;
}
}
diff --git a/classes/database/connection.php b/classes/database/connection.php
index f58329bf8d..28ab90d794 100644
--- a/classes/database/connection.php
+++ b/classes/database/connection.php
@@ -7,6 +7,7 @@
* @package Fuel/Database
* @category Base
* @author Kohana Team
+ * @author Nested transactions - Sergey Ogarkov, sogarkov@gmail.com
* @copyright (c) 2008-2010 Kohana Team
* @license http://kohanaphp.com/license
*/
@@ -55,7 +56,7 @@ public static function instance($name = null, array $config = null, $writable =
$name = \Config::get('db.active');
}
- if ( ! $writable and ($readonly = \Config::get("db.{$name}.readonly", false)))
+ if ( ! $writable and ($readonly = \Config::get('db.'.$name.'.readonly', false)))
{
! isset(static::$_readonly[$name]) and static::$_readonly[$name] = \Arr::get($readonly, array_rand($readonly));
$name = static::$_readonly[$name];
@@ -66,12 +67,12 @@ public static function instance($name = null, array $config = null, $writable =
if ($config === null)
{
// Load the configuration for this database
- $config = \Config::get("db.{$name}");
+ $config = \Config::get('db.'.$name);
}
if ( ! isset($config['type']))
{
- throw new \FuelException('Database type not defined in "{$name}" configuration or "{$name}" configuration does not exist');
+ throw new \FuelException('Database type not defined in "'.$name.'" configuration or "'.$name.'" configuration does not exist');
}
// Set the driver class name
@@ -99,6 +100,19 @@ public static function instance($name = null, array $config = null, $writable =
*/
protected $_instance;
+ /**
+ *
+ * @var bool $_in_transation allows transactions
+ */
+ protected $_in_transaction = false;
+
+ /**
+ *
+ * @var int Transaction nesting depth counter.
+ * Should be modified AFTER a driver has changed the level successfully
+ */
+ protected $_transaction_depth = 0;
+
/**
* @var resource Raw server connection
*/
@@ -645,21 +659,16 @@ public function quote_identifier($value)
return $this->quote_identifier($value).' AS '.$this->quote_identifier($alias);
}
- if (strpos($value, '"') !== false)
- {
- // required for PHP 5.5- (no access to $this in closure)
- $that = $this;
- // Quote the column in FUNC("ident") identifiers
- return preg_replace_callback('/"(.+?)"/', function ($matches) use($that) { return $that->quote_identifier($matches[1]); }, $value);
- }
- elseif (preg_match("/^'(.*)?'$/", $value))
+ if (preg_match('/^(["\']).*\1$/m', $value))
{
- // return quoted values as-is
return $value;
}
- elseif (strpos($value, '.') !== false)
+
+ if (strpos($value, '.') !== false)
{
// Split the identifier into the individual parts
+ // This is slightly broken, because a table or column name
+ // (or user-defined alias!) might legitimately contain a period.
$parts = explode('.', $value);
if ($prefix = $this->table_prefix())
@@ -675,10 +684,12 @@ public function quote_identifier($value)
// Quote each of the parts
return implode('.', array_map(array($this, __FUNCTION__), $parts));
}
- else
- {
- return $this->_identifier.$value.$this->_identifier;
- }
+
+ // That you can simply escape the identifier by doubling
+ // it is a built-in assumption which may not be valid for
+ // all connection types! However, it's true for MySQL,
+ // SQLite, Postgres and other ANSI SQL-compliant DBs.
+ return $this->_identifier.str_replace($this->_identifier, $this->_identifier.$this->_identifier, $value).$this->_identifier;
}
/**
@@ -698,36 +709,181 @@ abstract public function escape($value);
*
* $db->in_transaction();
*
- * @return bool
+ * @return bool
*/
- abstract public function in_transaction();
+ public function in_transaction()
+ {
+ return $this->_in_transaction;
+ }
/**
- * Begins a transaction on instance
+ * Begins a nested transaction on instance
*
* $db->start_transaction();
*
- * @return bool
+ * @return bool
*/
- abstract public function start_transaction();
+ public function start_transaction()
+ {
+ $result = true;
+
+ if ($this->_transaction_depth == 0)
+ {
+ if ($this->driver_start_transaction())
+ {
+ $this->_in_transaction = true;
+ }
+ else
+ {
+ $result = false;
+ }
+ }
+ else
+ {
+ $result = $this->set_savepoint($this->_transaction_depth);
+ // If savepoint is not supported it is not an error
+ isset($result) or $result = true;
+ }
+
+ $result and $this->_transaction_depth ++;
+
+ return $result;
+ }
/**
- * Commits all pending transactional queries
+ * Commits nested transaction
*
* $db->commit_transaction();
*
- * @return bool
+ * @return bool
*/
- abstract public function commit_transaction();
+ public function commit_transaction()
+ {
+ // Fake call of the commit
+ if ($this->_transaction_depth <= 0)
+ {
+ return false;
+ }
+
+ if ($this->_transaction_depth - 1)
+ {
+ $result = $this->release_savepoint($this->_transaction_depth - 1);
+ // If savepoint is not supported it is not an error
+ ! isset($result) and $result = true;
+ }
+ else
+ {
+ $this->_in_transaction = false;
+ $result = $this->driver_commit();
+ }
+
+ $result and $this->_transaction_depth --;
+
+ return $result;
+ }
/**
- * Rollsback all pending transactional queries
+ * Rollsback nested pending transaction queries.
+ * Rollback to the current level uses SAVEPOINT,
+ * it does not work if current RDBMS does not support them.
+ * In this case system rollbacks all queries and closes the transaction
*
* $db->rollback_transaction();
*
- * @return bool
+ * @param bool $rollback_all:
+ * true - rollback everything and close transaction;
+ * false - rollback only current level
+ *
+ * @return bool
+ */
+ public function rollback_transaction($rollback_all = true)
+ {
+ if ($this->_transaction_depth > 0)
+ {
+ if($rollback_all or $this->_transaction_depth == 1)
+ {
+ if($result = $this->driver_rollback())
+ {
+ $this->_transaction_depth = 0;
+ $this->_in_transaction = false;
+ }
+ }
+ else
+ {
+ $result = $this->rollback_savepoint($this->_transaction_depth - 1);
+ // If savepoint is not supported it is not an error
+ isset($result) or $result = true;
+
+ $result and $this->_transaction_depth -- ;
+ }
+ }
+ else
+ {
+ $result = false;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Begins a transaction on the driver level
+ *
+ * @return bool
+ */
+ abstract protected function driver_start_transaction();
+
+ /**
+ * Commits all pending transactional queries on the driver level
+ *
+ * @return bool
+ */
+ abstract protected function driver_commit();
+
+ /**
+ * Rollsback all pending transactional queries on the driver level
+ *
+ * @return bool
+ */
+ abstract protected function driver_rollback();
+
+ /**
+ * Sets savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ * null - RDBMS does not support savepoints
*/
- abstract public function rollback_transaction();
+ protected function set_savepoint($name)
+ {
+ return null;
+ }
+
+ /**
+ * Release savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ * null - RDBMS does not support savepoints
+ */
+ protected function release_savepoint($name)
+ {
+ return null;
+ }
+
+ /**
+ * Rollback savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ * null - RDBMS does not support savepoints
+ */
+ protected function rollback_savepoint($name)
+ {
+ return null;
+ }
/**
* Returns the raw connection object for custom method access
diff --git a/classes/database/mysql/connection.php b/classes/database/mysql/connection.php
index 2cb29ca94b..89ed5e6603 100644
--- a/classes/database/mysql/connection.php
+++ b/classes/database/mysql/connection.php
@@ -36,11 +36,6 @@ class Database_MySQL_Connection extends \Database_Connection
*/
protected $_identifier = '`';
- /**
- * @var bool Allows transactions
- */
- protected $_in_transaction = false;
-
/**
* @var string Which kind of DB is used
*/
@@ -464,32 +459,57 @@ public function error_info()
return array($errno, empty($errno)? null : $errno, empty($errno) ? null : mysql_error($this->_connection));
}
- public function in_transaction()
- {
- return $this->_in_transaction;
- }
-
- public function start_transaction()
+ protected function driver_start_transaction()
{
- $this->query(0, 'SET AUTOCOMMIT=0', false);
$this->query(0, 'START TRANSACTION', false);
- $this->_in_transaction = true;
return true;
}
- public function commit_transaction()
+ protected function driver_commit()
{
$this->query(0, 'COMMIT', false);
- $this->query(0, 'SET AUTOCOMMIT=1', false);
- $this->_in_transaction = false;
return true;
}
- public function rollback_transaction()
+ protected function driver_rollback()
{
$this->query(0, 'ROLLBACK', false);
- $this->query(0, 'SET AUTOCOMMIT=1', false);
- $this->_in_transaction = false;
+ return true;
+ }
+
+ /**
+ * Sets savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ */
+ protected function set_savepoint($name) {
+ $this->query(0, 'SAVEPOINT LEVEL'.$name, false);
+ return true;
+ }
+
+ /**
+ * Release savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ */
+ protected function release_savepoint($name) {
+ $this->query(0, 'RELEASE SAVEPOINT LEVEL'.$name, false);
+ return true;
+ }
+
+ /**
+ * Rollback savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ */
+ protected function rollback_savepoint($name) {
+ $this->query(0, 'ROLLBACK TO SAVEPOINT LEVEL'.$name, false);
return true;
}
diff --git a/classes/database/mysqli/connection.php b/classes/database/mysqli/connection.php
index 28ca3a0b8f..36697f1de3 100644
--- a/classes/database/mysqli/connection.php
+++ b/classes/database/mysqli/connection.php
@@ -40,11 +40,6 @@ class Database_MySQLi_Connection extends \Database_Connection
*/
protected $_identifier = '`';
- /**
- * @var bool Allows transactions
- */
- protected $_in_transaction = false;
-
/**
* @var string Which kind of DB is used
*/
@@ -132,7 +127,8 @@ public function connect()
// No connection exists
$this->_connection = null;
- throw new \Database_Exception('No MySQLi Connection', 0);
+ $error_code = is_numeric($e->getCode()) ? $e->getCode() : 0;
+ throw new \Database_Exception(str_replace($password, str_repeat('*', 10), $e->getMessage()), $error_code, $e);
}
// \xFF is a better delimiter, but the PHP driver uses underscore
@@ -481,32 +477,57 @@ public function error_info()
return array($errno, empty($errno)? null : $errno, empty($errno) ? null : $this->_connection->error);
}
- public function in_transaction()
- {
- return $this->_in_transaction;
- }
-
- public function start_transaction()
+ protected function driver_start_transaction()
{
- $this->query(0, 'SET AUTOCOMMIT=0', false);
$this->query(0, 'START TRANSACTION', false);
- $this->_in_transaction = true;
return true;
}
- public function commit_transaction()
+ protected function driver_commit()
{
$this->query(0, 'COMMIT', false);
- $this->query(0, 'SET AUTOCOMMIT=1', false);
- $this->_in_transaction = false;
return true;
}
- public function rollback_transaction()
+ protected function driver_rollback()
{
$this->query(0, 'ROLLBACK', false);
- $this->query(0, 'SET AUTOCOMMIT=1', false);
- $this->_in_transaction = false;
+ return true;
+ }
+
+ /**
+ * Sets savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ */
+ protected function set_savepoint($name) {
+ $this->query(0, 'SAVEPOINT LEVEL'.$name, false);
+ return true;
+ }
+
+ /**
+ * Release savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ */
+ protected function release_savepoint($name) {
+ $this->query(0, 'RELEASE SAVEPOINT LEVEL'.$name, false);
+ return true;
+ }
+
+ /**
+ * Rollback savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ */
+ protected function rollback_savepoint($name) {
+ $this->query(0, 'ROLLBACK TO SAVEPOINT LEVEL'.$name, false);
return true;
}
diff --git a/classes/database/pdo/connection.php b/classes/database/pdo/connection.php
index ab3d785200..4c1cd3da06 100644
--- a/classes/database/pdo/connection.php
+++ b/classes/database/pdo/connection.php
@@ -24,11 +24,6 @@ class Database_PDO_Connection extends \Database_Connection
*/
protected $_identifier = '';
- /**
- * @var bool $_in_transation allows transactions
- */
- protected $_in_transaction = false;
-
/**
* @var string $_db_type which kind of DB is used
*/
@@ -89,6 +84,12 @@ public function connect()
$attrs[\PDO::MYSQL_ATTR_COMPRESS] = true;
}
+ // add the charset to the DSN if needed
+ if ( ! empty($this->_config['charset']) and strpos($dsn, ';charset=') === false and strtolower($this->_db_type) != 'sqlite')
+ {
+ $dsn .= ';charset='.$this->_config['charset'];
+ }
+
try
{
// Create a new PDO connection
@@ -96,22 +97,26 @@ public function connect()
}
catch (\PDOException $e)
{
- $error_code = is_numeric($e->getCode()) ? $e->getCode() : 0;
+ // and convert the exception in a database exception
+ if ( ! is_numeric($error_code = $e->getCode()))
+ {
+ if ($this->_connection)
+ {
+ $error_code = $this->_connection->errorinfo();
+ $error_code = $error_code[1];
+ }
+ else
+ {
+ $error_code = 0;
+ }
+ }
throw new \Database_Exception(str_replace($password, str_repeat('*', 10), $e->getMessage()), $error_code, $e);
}
if ( ! empty($this->_config['charset']))
{
- // Set Charset for SQL Server connection
- if (strtolower($this->driver_name()) == 'sqlsrv')
- {
- $this->_connection->setAttribute(\PDO::SQLSRV_ATTR_ENCODING, \PDO::SQLSRV_ENCODING_SYSTEM);
- }
- else
- {
- // Set the character set
- $this->set_charset($this->_config['charset']);
- }
+ // Set the character set
+ $this->set_charset($this->_config['charset']);
}
}
@@ -133,6 +138,10 @@ public function disconnect()
*/
public function driver_name()
{
+ // Make sure the database is connected
+ $this->_connection or $this->connect();
+
+ // Getting driver name
return $this->_connection->getAttribute(\PDO::ATTR_DRIVER_NAME);
}
@@ -146,8 +155,23 @@ public function set_charset($charset)
// Make sure the database is connected
$this->_connection or $this->connect();
- // Execute a raw SET NAMES query
- $this->_connection->exec('SET NAMES '.$this->quote($charset));
+ // Set Charset for SQL Server connection
+ if (strtolower($this->driver_name()) == 'sqlsrv')
+ {
+ $this->_connection->setAttribute(\PDO::SQLSRV_ATTR_ENCODING, \PDO::SQLSRV_ENCODING_SYSTEM);
+ }
+ // Set Charset for SQLite connection
+ elseif (strtolower($this->driver_name()) == 'sqlite')
+ {
+ // Execute a raw PRAGMA encoding query
+ $this->_connection->exec('PRAGMA encoding = ' . $this->quote($charset));
+ }
+ // Set Charset for any connection except ODBC, as it throws exception
+ elseif (strtolower($this->driver_name()) != 'odbc')
+ {
+ // Execute a raw SET NAMES query
+ $this->_connection->exec('SET NAMES '.$this->quote($charset));
+ }
}
/**
@@ -230,7 +254,19 @@ public function query($type, $sql, $as_object)
isset($benchmark) and \Profiler::delete($benchmark);
// and convert the exception in a database exception
- $error_code = is_numeric($e->getCode()) ? $e->getCode() : 0;
+ if ( ! is_numeric($error_code = $e->getCode()))
+ {
+ if ($this->_connection)
+ {
+ $error_code = $this->_connection->errorinfo();
+ $error_code = $error_code[1];
+ }
+ else
+ {
+ $error_code = 0;
+ }
+ }
+
throw new \Database_Exception($e->getMessage().' with query: "'.$sql.'"', $error_code, $e);
}
}
@@ -239,7 +275,18 @@ public function query($type, $sql, $as_object)
else
{
// and convert the exception in a database exception
- $error_code = is_numeric($e->getCode()) ? $e->getCode() : 0;
+ if ( ! is_numeric($error_code = $e->getCode()))
+ {
+ if ($this->_connection)
+ {
+ $error_code = $this->_connection->errorinfo();
+ $error_code = $error_code[1];
+ }
+ else
+ {
+ $error_code = 0;
+ }
+ }
throw new \Database_Exception($e->getMessage().' with query: "'.$sql.'"', $error_code, $e);
}
}
@@ -431,25 +478,14 @@ public function error_info()
return $this->_connection->errorInfo();
}
- /**
- * Returns wether the connection is in transaction
- *
- * @return bool
- */
- public function in_transaction()
- {
- return $this->_in_transaction;
- }
-
/**
* Start a transaction
*
* @return bool
*/
- public function start_transaction()
+ protected function driver_start_transaction()
{
$this->_connection or $this->connect();
- $this->_in_transaction = true;
return $this->_connection->beginTransaction();
}
@@ -458,9 +494,8 @@ public function start_transaction()
*
* @return bool
*/
- public function commit_transaction()
+ protected function driver_commit()
{
- $this->_in_transaction = false;
return $this->_connection->commit();
}
@@ -468,9 +503,48 @@ public function commit_transaction()
* Rollback a transaction
* @return bool
*/
- public function rollback_transaction()
+ protected function driver_rollback()
{
- $this->_in_transaction = false;
return $this->_connection->rollBack();
}
+
+ /**
+ * Sets savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ * null - RDBMS does not support savepoints
+ */
+ protected function set_savepoint($name) {
+ $result = $this->_connection->exec('SAVEPOINT LEVEL'.$name);
+ return $result !== false;
+ }
+
+ /**
+ * Release savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ * null - RDBMS does not support savepoints
+ */
+ protected function release_savepoint($name) {
+ $result = $this->_connection->exec('RELEASE SAVEPOINT LEVEL'.$name);
+ return $result !== false;
+ }
+
+ /**
+ * Rollback savepoint of the transaction
+ *
+ * @param string $name name of the savepoint
+ * @return boolean true - savepoint was set successfully;
+ * false - failed to set savepoint;
+ * null - RDBMS does not support savepoints
+ */
+ protected function rollback_savepoint($name) {
+ $result = $this->_connection->exec('ROLLBACK TO SAVEPOINT LEVEL'.$name);
+ return $result !== false;
+ }
+
}
diff --git a/classes/database/query/builder.php b/classes/database/query/builder.php
index 7b85deb76e..a117e79e55 100644
--- a/classes/database/query/builder.php
+++ b/classes/database/query/builder.php
@@ -194,10 +194,11 @@ protected function _compile_order_by(\Database_Connection $db, array $columns)
{
list ($column, $direction) = $group;
+ $direction = strtoupper($direction);
if ( ! empty($direction))
{
// Make the direction uppercase
- $direction = ' '.strtoupper($direction);
+ $direction = ' '.($direction == 'ASC' ? 'ASC' : 'DESC');
}
$sort[] = $db->quote_identifier($column).$direction;
diff --git a/classes/database/query/builder/insert.php b/classes/database/query/builder/insert.php
index 3e9667a2e4..68bee47728 100644
--- a/classes/database/query/builder/insert.php
+++ b/classes/database/query/builder/insert.php
@@ -94,7 +94,18 @@ public function values(array $values)
// Get all of the passed values
$values = func_get_args();
- $this->_values = array_merge($this->_values, $values);
+ // And process them
+ foreach ($values as $value)
+ {
+ if (is_array(reset($value)))
+ {
+ $this->_values = array_merge($this->_values, $value);
+ }
+ else
+ {
+ $this->_values[] = $value;
+ }
+ }
return $this;
}
@@ -202,4 +213,4 @@ public function reset()
return $this;
}
-}
\ No newline at end of file
+}
diff --git a/classes/database/query/builder/join.php b/classes/database/query/builder/join.php
index 4ae67d9f0a..52eea227f6 100644
--- a/classes/database/query/builder/join.php
+++ b/classes/database/query/builder/join.php
@@ -137,7 +137,7 @@ public function compile($db = null)
}
// Quote each of the identifiers used for the condition
- $conditions[] = $db->quote_identifier($c1).$op.' '.$db->quote_identifier($c2);
+ $conditions[] = $db->quote_identifier($c1).$op.' '.(is_null($c2)?'NULL':$db->quote_identifier($c2));
}
// remove the first chain type
@@ -160,4 +160,4 @@ public function reset()
$this->_table = NULL;
$this->_on = array();
}
-}
\ No newline at end of file
+}
diff --git a/classes/date.php b/classes/date.php
index 7ead2d7c15..e35d61a954 100644
--- a/classes/date.php
+++ b/classes/date.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -171,8 +171,10 @@ public static function create_from_string($input, $pattern_key = 'local')
throw new \UnexpectedValueException('Input was not recognized by pattern.');
}
+ // convert it into a timestamp
$timestamp = mktime($time['tm_hour'], $time['tm_min'], $time['tm_sec'],
$time['tm_mon'] + 1, $time['tm_mday'], $time['tm_year'] + 1900);
+
if ($timestamp === false)
{
throw new \OutOfBoundsException('Input was invalid.'.(PHP_INT_SIZE == 4?' A 32-bit system only supports dates between 1901 and 2038.':''));
diff --git a/classes/db.php b/classes/db.php
index 28ba8eaf30..273d92eddb 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -2,8 +2,7 @@
/**
* Database object creation helper methods.
*
- * @package Fuel/Database
- * @category Base
+ * @package Fuel\Database
* @author Kohana Team
* @copyright (c) 2009 Kohana Team
* @license http://kohanaphp.com/license
@@ -389,16 +388,22 @@ public static function commit_transaction($db = null)
}
/**
- * Rollsback all pending transactional queries
+ * Rollsback pending transactional queries
+ * Rollback to the current level uses SAVEPOINT,
+ * it does not work if current RDBMS does not support them.
+ * In this case system rollsback all queries and closes the transaction
*
* DB::rollback_transaction();
*
- * @param string db connection
+ * @param string $db connection
+ * @param bool $rollback_all:
+ * true - rollback everything and close transaction;
+ * false - rollback only current level
* @return bool
*/
- public static function rollback_transaction($db = null)
+ public static function rollback_transaction($db = null, $rollback_all = true)
{
- return \Database_Connection::instance($db)->rollback_transaction();
+ return \Database_Connection::instance($db)->rollback_transaction($rollback_all);
}
}
diff --git a/classes/dbutil.php b/classes/dbutil.php
index b78cb061bd..0951ae47ff 100644
--- a/classes/dbutil.php
+++ b/classes/dbutil.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -95,7 +95,7 @@ public static function drop_table($table, $db = null)
*/
public static function rename_table($table, $new_table_name, $db = null)
{
- return \DB::query('RENAME TABLE '.\DB::quote_identifier(\DB::table_prefix($table, $db ? $db : static::$connection), $db ? $db : static::$connection).' TO '.\DB::quote_identifier(\DB::table_prefix($new_table_name)),\DB::UPDATE)->execute($db ? $db : static::$connection);
+ return \DB::query('RENAME TABLE '.\DB::quote_identifier(\DB::table_prefix($table, $db ? $db : static::$connection), $db ? $db : static::$connection).' TO '.\DB::quote_identifier(\DB::table_prefix($new_table_name, $db ? $db : static::$connection)),\DB::UPDATE)->execute($db ? $db : static::$connection);
}
/**
@@ -372,7 +372,7 @@ protected static function process_fields($fields, $prefix = '', $db = null)
if(array_key_exists('DEFAULT', $attr))
{
- $sql .= ' DEFAULT '.(($attr['DEFAULT'] instanceof \Database_Expression) ? $attr['DEFAULT'] : \DB::escape($attr['DEFAULT']));
+ $sql .= ' DEFAULT '.(($attr['DEFAULT'] instanceof \Database_Expression) ? $attr['DEFAULT'] : \DB::quote($attr['DEFAULT']));
}
if(array_key_exists('NULL', $attr) and $attr['NULL'] === true)
@@ -394,6 +394,11 @@ protected static function process_fields($fields, $prefix = '', $db = null)
$sql .= ' PRIMARY KEY';
}
+ if (array_key_exists('COMMENT', $attr))
+ {
+ $sql .= ' COMMENT '.\DB::escape($attr['COMMENT'], $db ? $db : static::$connection);
+ }
+
if (array_key_exists('FIRST', $attr) and $attr['FIRST'] === true)
{
$sql .= ' FIRST';
@@ -403,11 +408,6 @@ protected static function process_fields($fields, $prefix = '', $db = null)
$sql .= ' AFTER '.\DB::quote_identifier($attr['AFTER'], $db ? $db : static::$connection);
}
- if (array_key_exists('COMMENT', $attr))
- {
- $sql .= ' COMMENT '.\DB::escape($attr['COMMENT'], $db ? $db : static::$connection);
- }
-
$sql_fields[] = $sql;
}
diff --git a/classes/debug.php b/classes/debug.php
index c58870f897..be1cd4d6cb 100644
--- a/classes/debug.php
+++ b/classes/debug.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -59,7 +59,7 @@ public static function dump()
if (isset($trace['file']))
{
// If being called from within, show the file above in the backtrack
- if (strpos($trace['file'], 'core/classes/debug.php') !== FALSE)
+ if (strpos($trace['file'], 'core/classes/debug.php') !== false)
{
$callee = $backtrace[$stack+1];
$label = \Inflector::humanize($backtrace[$stack+1]['function']);
@@ -114,7 +114,7 @@ public static function inspect()
$backtrace = debug_backtrace();
// If being called from within, show the file above in the backtrack
- if (strpos($backtrace[0]['file'], 'core/classes/debug.php') !== FALSE)
+ if (strpos($backtrace[0]['file'], 'core/classes/debug.php') !== false)
{
$callee = $backtrace[1];
$label = \Inflector::humanize($backtrace[1]['function']);
@@ -354,9 +354,54 @@ public static function file_lines($filepath, $line_num, $highlight = true, $padd
return $debug_lines;
}
- public static function backtrace()
+ /**
+ * Output the call stack from here, or the supplied one.
+ *
+ * @param array (optional) A backtrace to output
+ * @return string Formatted backtrace
+ */
+ public static function backtrace($trace = null)
{
- return static::dump(debug_backtrace());
+ $trace or $trace = debug_backtrace();
+
+ if (\Fuel::$is_cli) {
+ // Special case for CLI since the var_dump of a backtrace is of little use.
+ $str = '';
+ foreach ($trace as $i => $frame)
+ {
+ $line = "#$i\t";
+
+ if ( ! isset($frame['file']))
+ {
+ $line .= "[internal function]";
+ }
+ else
+ {
+ $line .= $frame['file'] . ":" . $frame['line'];
+ }
+
+ $line .= "\t";
+
+ if (isset($frame['function']))
+ {
+ if (isset($frame['class']))
+ {
+ $line .= $frame['class'] . '::';
+ }
+
+ $line .= $frame['function'] . "()";
+ }
+
+ $str .= $line . "\n";
+
+ }
+
+ return $str;
+ }
+ else
+ {
+ return static::dump($trace);
+ }
}
/**
@@ -501,4 +546,3 @@ public static function benchmark($callable, array $params = array())
}
}
-
diff --git a/classes/error.php b/classes/error.php
index 0502c3bc1e..b4be7e08f7 100644
--- a/classes/error.php
+++ b/classes/error.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -189,6 +189,11 @@ public static function show_php_error(\Exception $e)
if (\Fuel::$is_cli)
{
\Cli::write(\Cli::color($data['severity'].' - '.$data['message'].' in '.\Fuel::clean_path($data['filepath']).' on line '.$data['error_line'], 'red'));
+ if (\Config::get('cli_backtrace'))
+ {
+ \Cli::write('Stack trace:');
+ \Cli::write(\Debug::backtrace($e->getTrace()));
+ }
return;
}
@@ -305,5 +310,3 @@ protected static function prepare_exception(\Exception $e, $fatal = true)
}
}
-
-
diff --git a/classes/event.php b/classes/event.php
index 6f996085f8..765b5bc830 100644
--- a/classes/event.php
+++ b/classes/event.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/event/instance.php b/classes/event/instance.php
index f71f9b676d..c8fd667ba9 100644
--- a/classes/event/instance.php
+++ b/classes/event/instance.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/fieldset.php b/classes/fieldset.php
index b8c4a3a5df..dd22229450 100644
--- a/classes/fieldset.php
+++ b/classes/fieldset.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -383,6 +383,22 @@ public function add_after($name, $label = '', array $attributes = array(), array
return $field;
}
+ /**
+ * Delete a field instance
+ *
+ * @param string field name or null to fetch an array of all
+ * @return Fieldset this fieldset, for chaining
+ */
+ public function delete($name)
+ {
+ if (isset($this->field[$name]))
+ {
+ unset($this->field[$name]);
+ }
+
+ return $this;
+ }
+
/**
* Get Field instance
*
@@ -395,30 +411,32 @@ public function field($name = null, $flatten = false, $tabular_form = true)
{
if ($name === null)
{
- if ( ! $flatten)
- {
- return $this->fields;
- }
-
$fields = $this->fields;
- foreach ($this->fieldset_children as $fs_name => $fieldset)
+
+ if ($flatten)
{
- if ($tabular_form or ! $fieldset->get_tabular_form())
+ foreach ($this->fieldset_children as $fs_name => $fieldset)
{
- \Arr::insert_after_key($fields, $fieldset->field(null, true), $fs_name);
+ if ($tabular_form or ! $fieldset->get_tabular_form())
+ {
+ \Arr::insert_after_key($fields, $fieldset->field(null, true), $fs_name);
+ }
+ unset($fields[$fs_name]);
}
- unset($fields[$fs_name]);
}
return $fields;
}
if ( ! array_key_exists($name, $this->fields))
{
- foreach ($this->fieldset_children as $fieldset)
+ if ($flatten)
{
- if (($field = $fieldset->field($name)) !== false)
+ foreach ($this->fieldset_children as $fieldset)
{
- return $field;
+ if (($field = $fieldset->field($name)) !== false)
+ {
+ return $field;
+ }
}
}
return false;
diff --git a/classes/fieldset/field.php b/classes/fieldset/field.php
index f6975a2176..900c9a2870 100644
--- a/classes/fieldset/field.php
+++ b/classes/fieldset/field.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -139,11 +139,17 @@ public function __construct($name, $label = '', array $attributes = array(), arr
*/
public function set_fieldset(Fieldset $fieldset)
{
+ // if we currently have a fieldset
if ($this->fieldset)
{
- throw new \RuntimeException('Field already belongs to a fieldset, cannot be reassigned.');
+ // remove the field from the fieldset
+ $this->fieldset->delete($this->name);
}
+ // add this field to the new fieldset
+ $fieldset->add($this);
+
+ // swap fieldsets
$this->fieldset = $fieldset;
return $this;
diff --git a/classes/file.php b/classes/file.php
index 202875e5b6..f121e1d0bb 100644
--- a/classes/file.php
+++ b/classes/file.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -103,6 +103,26 @@ public static function get_url($path, array $config = array(), $area = null)
return static::get($path, $config, $area)->get_url();
}
+ /**
+ * Check for file existence
+ *
+ * @param string path to file to check
+ * @param string|File_Area|null file area name, object or null for base area
+ * @return bool
+ */
+ public static function exists($path, $area = null)
+ {
+ $path = rtrim(static::instance($area)->get_path($path), '\\/');
+
+ // resolve symlinks
+ while ($path and is_link($path))
+ {
+ $path = readlink($path);
+ }
+
+ return is_file($path);
+ }
+
/**
* Create an empty file
*
@@ -782,15 +802,18 @@ public static function file_info($path, $area = null)
* @param string|null custom name for the file to be downloaded
* @param string|null custom mime type or null for file mime type
* @param string|File_Area|null file area name, object or null for base area
+ * @param bool delete the file after download when true
+ * @param string disposition, must be 'attachment' or 'inline'
*/
- public static function download($path, $name = null, $mime = null, $area = null)
+ public static function download($path, $name = null, $mime = null, $area = null, $delete = false, $disposition = 'attachment')
{
$info = static::file_info($path, $area);
$class = get_called_class();
empty($mime) or $info['mimetype'] = $mime;
empty($name) or $info['basename'] = $name;
+ in_array($disposition, array('inline', 'attachment')) or $disposition = 'attachment';
- \Event::register('fuel-shutdown', function () use($info, $area, $class) {
+ \Event::register('fuel-shutdown', function () use($info, $area, $class, $delete, $disposition) {
if ( ! $file = call_user_func(array($class, 'open_file'), @fopen($info['realpath'], 'rb'), LOCK_SH, $area))
{
@@ -806,12 +829,12 @@ public static function download($path, $name = null, $mime = null, $area = null)
! ini_get('safe_mode') and set_time_limit(0);
header('Content-Type: '.$info['mimetype']);
- header('Content-Disposition: attachment; filename="'.$info['basename'].'"');
- header('Content-Description: File Transfer');
+ header('Content-Disposition: '.$disposition.'; filename="'.$info['basename'].'"');
+ $disposition == 'attachment' and header('Content-Description: File Transfer');
header('Content-Length: '.$info['size']);
header('Content-Transfer-Encoding: binary');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+ $disposition == 'attachment' and header('Expires: 0');
+ $disposition == 'attachment' and header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
while( ! feof($file))
{
@@ -819,6 +842,11 @@ public static function download($path, $name = null, $mime = null, $area = null)
}
call_user_func(array($class, 'close_file'), $file, $area);
+
+ if ($delete)
+ {
+ call_user_func(array($class, 'delete'), $info['realpath'], $area);
+ }
});
exit;
diff --git a/classes/file/area.php b/classes/file/area.php
index 85bec829fc..59cc74c198 100644
--- a/classes/file/area.php
+++ b/classes/file/area.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/file/handler/directory.php b/classes/file/handler/directory.php
index 68ec72effc..d2c9c8bf86 100644
--- a/classes/file/handler/directory.php
+++ b/classes/file/handler/directory.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/file/handler/file.php b/classes/file/handler/file.php
index 2c3c8008b6..1d97b0c410 100644
--- a/classes/file/handler/file.php
+++ b/classes/file/handler/file.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/finder.php b/classes/finder.php
index 601759a66a..290f5ec2b2 100644
--- a/classes/finder.php
+++ b/classes/finder.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -518,9 +518,13 @@ protected function cache($name, $data = null, $lifetime = null)
{
chmod($dir.$file, \Config::get('file.chmod.files', 0666));
}
- catch (\Exception $e)
+ catch (\PhpErrorException $e)
{
- // we probably don't have permission, lets hope rights are ok
+ // if we get something else then a chmod error, bail out
+ if (substr($e->getMessage(),0,8) !== 'chmod():')
+ {
+ throw new $e;
+ }
}
}
diff --git a/classes/form.php b/classes/form.php
index 03329ed7b3..50aaea0628 100644
--- a/classes/form.php
+++ b/classes/form.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/form/instance.php b/classes/form/instance.php
index d12809e1aa..f0d9672cc1 100644
--- a/classes/form/instance.php
+++ b/classes/form/instance.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -106,12 +106,11 @@ public function open($attributes = array(), array $hidden = array())
$attributes = ! is_array($attributes) ? array('action' => $attributes) : $attributes;
// If there is still no action set, Form-post
- if( ! array_key_exists('action', $attributes) or $attributes['action'] === null)
+ if( ! array_key_exists('action', $attributes) or empty($attributes['action']))
{
$attributes['action'] = \Uri::main();
}
-
// If not a full URL, create one
elseif ( ! strpos($attributes['action'], '://'))
{
diff --git a/classes/format.php b/classes/format.php
index 8f69b2a4d1..3b8eed3479 100644
--- a/classes/format.php
+++ b/classes/format.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -33,11 +33,12 @@ class Format
*
* @param mixed general date to be converted
* @param string data format the file was provided in
+ * @param mixed additional parameter that can be passed on to a 'from' method
* @return Format
*/
- public static function forge($data = null, $from_type = null)
+ public static function forge($data = null, $from_type = null, $param = null)
{
- return new static($data, $from_type);
+ return new static($data, $from_type, $param);
}
/**
@@ -52,8 +53,13 @@ public static function forge($data = null, $from_type = null)
/**
* Do not use this directly, call forge()
+ *
+ * @param mixed general date to be converted
+ * @param string data format the file was provided in
+ * @param mixed additional parameter that can be passed on to a 'from' method
+ * @return Format
*/
- public function __construct($data = null, $from_type = null)
+ public function __construct($data = null, $from_type = null, $param = null)
{
// If the provided data is already formatted we should probably convert it to an array
if ($from_type !== null)
@@ -67,7 +73,7 @@ public function __construct($data = null, $from_type = null)
if (method_exists($this, '_from_' . $from_type))
{
- $data = call_user_func(array($this, '_from_' . $from_type), $data);
+ $data = call_user_func_array(array($this, '_from_' . $from_type), array($data, $param));
}
else
@@ -210,21 +216,28 @@ public function to_xml($data = null, $structure = null, $basenode = null, $use_c
*
* @param mixed $data
* @param mixed $delimiter
+ * @param mixed $enclose_numbers
+ * @param array $headings Custom headings to use
* @return string
*/
- public function to_csv($data = null, $delimiter = null)
+ public function to_csv($data = null, $delimiter = null, $enclose_numbers = null, array $headings = array())
{
// csv format settings
- $newline = \Config::get('format.csv.export.newline', \Config::get('format.csv.newline', "\n"));
- $delimiter or $delimiter = \Config::get('format.csv.export.delimiter', \Config::get('format.csv.delimiter', ','));
- $enclosure = \Config::get('format.csv.export.enclosure', \Config::get('format.csv.enclosure', '"'));
- $escape = \Config::get('format.csv.export.escape', \Config::get('format.csv.escape', '"'));
-
- // escape function
- $escaper = function($items) use($enclosure, $escape) {
- return array_map(function($item) use($enclosure, $escape){
- return str_replace($enclosure, $escape.$enclosure, $item);
- }, $items);
+ $newline = \Config::get('format.csv.newline', \Config::get('format.csv.export.newline', "\n"));
+ $delimiter or $delimiter = \Config::get('format.csv.delimiter', \Config::get('format.csv.export.delimiter', ','));
+ $enclosure = \Config::get('format.csv.enclosure', \Config::get('format.csv.export.enclosure', '"'));
+ $escape = \Config::get('format.csv.escape', \Config::get('format.csv.export.escape', '\\'));
+ is_null($enclose_numbers) and $enclose_numbers = \Config::get('format.csv.delimit_numbers', true);
+
+ // escape, delimit and enclose function
+ $escaper = function($items, $enclose_numbers) use($enclosure, $escape, $delimiter) {
+ return implode($delimiter, array_map(function($item) use($enclosure, $escape, $delimiter, $enclose_numbers) {
+ if ( ! is_numeric($item) or $enclose_numbers)
+ {
+ $item = $enclosure.str_replace($enclosure, $escape.$enclosure, $item).$enclosure;
+ }
+ return $item;
+ }, $items));
};
if ($data === null)
@@ -238,31 +251,34 @@ public function to_csv($data = null, $delimiter = null)
}
// Multi-dimensional array
- if (is_array($data) and \Arr::is_multi($data))
+ if (empty($headings))
{
- $data = array_values($data);
-
- if (\Arr::is_assoc($data[0]))
+ if (is_array($data) and \Arr::is_multi($data))
{
- $headings = array_keys($data[0]);
+ $data = array_values($data);
+
+ if (\Arr::is_assoc($data[0]))
+ {
+ $headings = array_keys($data[0]);
+ }
+ else
+ {
+ $headings = array_shift($data);
+ }
}
+ // Single array
else
{
- $headings = array_shift($data);
+ $headings = array_keys((array) $data);
+ $data = array($data);
}
}
- // Single array
- else
- {
- $headings = array_keys((array) $data);
- $data = array($data);
- }
- $output = $enclosure.implode($enclosure.$delimiter.$enclosure, $escaper($headings)).$enclosure.$newline;
+ $output = $escaper($headings, true).$newline;
foreach ($data as $row)
{
- $output .= $enclosure.implode($enclosure.$delimiter.$enclosure, $escaper((array) $row)).$enclosure.$newline;
+ $output .= $escaper($row, $enclose_numbers).$newline;
}
return rtrim($output, $newline);
@@ -285,7 +301,7 @@ public function to_json($data = null, $pretty = false)
// To allow exporting ArrayAccess objects like Orm\Model instances they need to be
// converted to an array first
$data = (is_array($data) or is_object($data)) ? $this->to_array($data) : $data;
- return $pretty ? static::pretty_json($data) : json_encode($data, \Config::get('format.json.encode.option', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP));
+ return $pretty ? static::pretty_json($data) : json_encode($data, \Config::get('format.json.encode.options', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP));
}
/**
@@ -365,7 +381,6 @@ public function to_yaml($data = null)
*/
protected function _from_xml($string, $recursive = false)
{
-
// If it forged with 'xml:ns'
if ( ! $this->ignore_namespaces)
{
@@ -395,13 +410,20 @@ protected function _from_xml($string, $recursive = false)
}
$_arr = is_string($string) ? simplexml_load_string($string, 'SimpleXMLElement', LIBXML_NOCDATA) : $string;
- $arr = array();
// Convert all objects SimpleXMLElement to array recursively
+ $arr = array();
foreach ((array)$_arr as $key => $val)
{
$this->ignore_namespaces or $key = \Arr::get($escape_keys, $key, $key);
- $arr[$key] = (is_array($val) or is_object($val)) ? $this->_from_xml($val, true) : $val;
+ if ( ! $val instanceOf \SimpleXMLElement or $val->count() or $val->attributes())
+ {
+ $arr[$key] = (is_array($val) or is_object($val)) ? $this->_from_xml($val, true) : $val;
+ }
+ else
+ {
+ $arr[$val->getName()] = null;
+ }
}
return $arr;
@@ -427,31 +449,60 @@ protected function _from_yaml($string)
* Import CSV data
*
* @param string $string
+ * @param bool $no_headings
* @return array
*/
- protected function _from_csv($string)
+ protected function _from_csv($string, $no_headings = false)
{
$data = array();
- $rows = preg_split('/(?<='.preg_quote(\Config::get('format.csv.import.enclosure', \Config::get('format.csv.enclosure', '"'))).')'.\Config::get('format.csv.regex_newline', '\n').'/', trim($string));
-
// csv config
- $delimiter = \Config::get('format.csv.import.delimiter', \Config::get('format.csv.delimiter', ','));
- $enclosure = \Config::get('format.csv.import.enclosure', \Config::get('format.csv.enclosure', '"'));
- $escape = \Config::get('format.csv.import.escape', \Config::get('format.csv.escape', '"'));
+ $newline = \Config::get('format.csv.regex_newline', "\n");
+ $delimiter = \Config::get('format.csv.delimiter', \Config::get('format.csv.import.delimiter', ','));
+ $escape = \Config::get('format.csv.escape', \Config::get('format.csv.import.escape', '"'));
+ // have to do this in two steps, empty string is a valid value for enclosure!
+ $enclosure = \Config::get('format.csv.enclosure', \Config::get('format.csv.import.enclosure', null));
+ $enclosure === null and $enclosure = '"';
+
+ if (empty($enclosure))
+ {
+ $rows = preg_split('/(['.$newline.'])/m', trim($string), -1, PREG_SPLIT_NO_EMPTY);
+ }
+ else
+ {
+ $rows = preg_split('/(?<=[0-9'.preg_quote($enclosure).'])'.$newline.'/', trim($string));
+ }
// Get the headings
- $headings = str_replace($escape.$enclosure, $enclosure, str_getcsv(array_shift($rows), $delimiter, $enclosure, $escape));
+ if ($no_headings !== false)
+ {
+ $headings = str_replace($escape.$enclosure, $enclosure, str_getcsv(array_shift($rows), $delimiter, $enclosure, $escape));
+ $headcount = count($headings);
+ }
+ // Process the rows
+ $incomplete = '';
foreach ($rows as $row)
{
- $data_fields = str_replace($escape.$enclosure, $enclosure, str_getcsv($row, $delimiter, $enclosure, $escape));
+ // process the row
+ $data_fields = str_replace($escape.$enclosure, $enclosure, str_getcsv($incomplete.($incomplete?$newline:'').$row, $delimiter, $enclosure, $escape));
- if (count($data_fields) == count($headings))
+ // if we didn't have headers, the first row determines the number of fields
+ if ( ! isset($headcount))
{
- $data[] = array_combine($headings, $data_fields);
+ $headcount = count($data_fields);
}
+ // finish the row if the have the correct field count, otherwise add the data to the next row
+ if (count($data_fields) == $headcount)
+ {
+ $data[] = $no_headings === false ? $data_fields : array_combine($headings, $data_fields);
+ $incomplete = '';
+ }
+ else
+ {
+ $incomplete = $row;
+ }
}
return $data;
@@ -488,7 +539,7 @@ private function _from_serialize($string)
*/
protected static function pretty_json($data)
{
- $json = json_encode($data, \Config::get('format.json.encode.option', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP));
+ $json = json_encode($data, \Config::get('format.json.encode.options', JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP));
if ( ! $json)
{
diff --git a/classes/ftp.php b/classes/ftp.php
index 9af526fa9d..124c1faf28 100644
--- a/classes/ftp.php
+++ b/classes/ftp.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -459,7 +459,11 @@ function delete_dir($filepath)
// we'll recursively call delete_dir()
if ( ! @ftp_delete($this->_conn_id, $item))
{
- $this->delete_dir($item);
+ // don't recurse into current of parent directory
+ if ( ! preg_match('/\/\.\.|\/\.$/', $item))
+ {
+ $this->delete_dir($item);
+ }
}
}
}
diff --git a/classes/fuel.php b/classes/fuel.php
index 84bde6ae74..626800914d 100644
--- a/classes/fuel.php
+++ b/classes/fuel.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -138,8 +138,14 @@ class_exists('Redis', false) or class_alias('Redis_Db', 'Redis');
\Config::load($config);
+ // Disable output compression if the client doesn't support it
+ if (static::$is_cli or ! in_array('gzip', explode(', ', \Input::headers('Accept-Encoding', ''))))
+ {
+ \Config::set('ob_callback', null);
+ }
+
// Start up output buffering
- static::$is_cli or ob_start(\Config::get('ob_callback', null));
+ ob_start(\Config::get('ob_callback'));
if (\Config::get('caching', false))
{
@@ -249,7 +255,7 @@ public static function finish()
}
}
// Restart the output buffer and send the new output
- ob_start();
+ ob_start(\Config::get('ob_callback'));
echo $output;
}
}
diff --git a/classes/html.php b/classes/html.php
index 134b503c85..f04461a100 100644
--- a/classes/html.php
+++ b/classes/html.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/httpexception.php b/classes/httpexception.php
index 9a8fc87c65..615ed3587a 100644
--- a/classes/httpexception.php
+++ b/classes/httpexception.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/httpexceptions.php b/classes/httpexceptions.php
index 959a80dad5..9376fc8d22 100644
--- a/classes/httpexceptions.php
+++ b/classes/httpexceptions.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/image.php b/classes/image.php
index cc644d0815..0353982698 100644
--- a/classes/image.php
+++ b/classes/image.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/image/driver.php b/classes/image/driver.php
index c9ad0253e0..30ec2ab040 100644
--- a/classes/image/driver.php
+++ b/classes/image/driver.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/image/gd.php b/classes/image/gd.php
index 4e50cd10eb..70b59f7efa 100644
--- a/classes/image/gd.php
+++ b/classes/image/gd.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -436,7 +436,8 @@ protected function add_background()
protected function create_transparent_image($width, $height, $resource = null)
{
$image = imagecreatetruecolor($width, $height);
- $color = $this->create_color($image, null, 0);
+ $bgcolor = $this->config['bgcolor'] == null ? '#000' : $this->config['bgcolor'];
+ $color = $this->create_color($image, $bgcolor, 0);
imagesavealpha($image, true);
if ($this->image_extension == 'gif' || $this->image_extension == 'png')
{
diff --git a/classes/image/imagemagick.php b/classes/image/imagemagick.php
index 26cab950dd..48e2288126 100644
--- a/classes/image/imagemagick.php
+++ b/classes/image/imagemagick.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/image/imagick.php b/classes/image/imagick.php
index 1f55d81a9e..ff2f7f8724 100644
--- a/classes/image/imagick.php
+++ b/classes/image/imagick.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/inflector.php b/classes/inflector.php
index 8d66bab698..b5b0eddf57 100644
--- a/classes/inflector.php
+++ b/classes/inflector.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -240,16 +240,13 @@ public static function ascii($str, $allow_non_ascii = false)
* Only works with UTF8 input and and only outputs 7 bit ASCII characters.
*
* @param string $str the text
- * @param string $sep the separator (either - or _)
+ * @param string $sep the separator
* @param bool $lowercase wether to convert to lowercase
* @param bool $allow_non_ascii wether to allow non ascii
* @return string the new title
*/
public static function friendly_title($str, $sep = '-', $lowercase = false, $allow_non_ascii = false)
{
- // Allow underscore, otherwise default to dash
- $sep = $sep === '_' ? '_' : '-';
-
// Remove tags
$str = \Security::strip_tags($str);
diff --git a/classes/input.php b/classes/input.php
index 33dcada66c..060c6f4f31 100644
--- a/classes/input.php
+++ b/classes/input.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -504,8 +504,8 @@ public static function headers($index = null, $default = null)
$headers[$key] = $value;
}
- $value = static::server('Content-Type') and $headers['Content-Type'] = $value;
- $value = static::server('Content-Length') and $headers['Content-Length'] = $value;
+ $value = static::server('Content_Type', static::server('Content-Type')) and $headers['Content-Type'] = $value;
+ $value = static::server('Content_Length', static::server('Content-Length')) and $headers['Content-Length'] = $value;
}
else
{
diff --git a/classes/lang.php b/classes/lang.php
index b25b56c998..475d67c1ac 100644
--- a/classes/lang.php
+++ b/classes/lang.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/lang/file.php b/classes/lang/file.php
index dded763b24..6bca2dee64 100644
--- a/classes/lang/file.php
+++ b/classes/lang/file.php
@@ -25,8 +25,7 @@ public function __construct($file = null, $languages = array(), $vars = array())
{
$this->file = $file;
- // we need the highest priority language last in the list
- $this->languages = array_reverse($languages);
+ $this->languages = $languages;
$this->vars = array(
'APPPATH' => APPPATH,
@@ -135,7 +134,7 @@ protected function find_file()
throw new \LangException(sprintf('File "%s" does not exist.', $this->file));
}
- return $paths;
+ return array_reverse($paths);
}
/**
diff --git a/classes/lang/php.php b/classes/lang/php.php
index 51449d1306..426877c119 100644
--- a/classes/lang/php.php
+++ b/classes/lang/php.php
@@ -7,8 +7,96 @@
*/
class Lang_Php extends \Lang_File
{
+ /**
+ * @var bool whether or not opcache is in use
+ */
+ protected static $uses_opcache = false;
+
+ /**
+ * @var bool whether or not APC is in use
+ */
+ protected static $uses_apc = false;
+
+ /**
+ * @var bool whether or not we need to flush the opcode cache after a save
+ */
+ protected static $flush_needed = false;
+
+ /**
+ * check the status of any opcache mechanism in use
+ */
+ public static function _init()
+ {
+ // do we have Opcache active?
+ static::$uses_opcache = (PHP_VERSION_ID >= 50500 and function_exists('opcache_invalidate'));
+
+ // do we have APC active?
+ static::$uses_apc = function_exists('apc_compile_file');
+
+ // determine if we have an opcode cache active
+ static::$flush_needed = static::$uses_opcache or static::$uses_apc;
+ }
+
+ /**
+ * @var string the extension used by this config file parser
+ */
protected $ext = '.php';
+ /**
+ * Formats the output and saved it to disc.
+ *
+ * @param string $identifier filename
+ * @param $contents $contents language array to save
+ * @return bool \File::update result
+ */
+ public function save($identifier, $contents)
+ {
+ // store the current filename
+ $file = $this->file;
+
+ // save it
+ $return = parent::save($identifier, $contents);
+
+ // existing file? saved? and do we need to flush the opcode cache?
+ if ($file == $this->file and $return and static::$flush_needed)
+ {
+ if ($this->file[0] !== '/' and ( ! isset($this->file[1]) or $this->file[1] !== ':'))
+ {
+ // locate the file
+ if ($pos = strripos($identifier, '::'))
+ {
+ // get the namespace path
+ if ($file = \Autoloader::namespace_path('\\'.ucfirst(substr($identifier, 0, $pos))))
+ {
+ // strip the namespace from the filename
+ $identifier = substr($identifier, $pos+2);
+
+ // strip the classes directory as we need the module root
+ $file = substr($file,0, -8).'lang'.DS.$identifier;
+ }
+ else
+ {
+ // invalid namespace requested
+ return false;
+ }
+ }
+ else
+ {
+ $file = \Finder::search('lang', $identifier);
+ }
+ }
+
+ // make sure we have a fallback
+ $file or $file = APPPATH.'lang'.DS.$identifier;
+
+ // flush the opcode caches that are active
+ static::$uses_opcache and opcache_invalidate($file, true);
+ static::$uses_apc and apc_compile_file($file);
+ }
+
+ return $return;
+ }
+
/**
* Loads in the given file and parses it.
*
diff --git a/classes/log.php b/classes/log.php
index c4e5491838..64cb953c7f 100644
--- a/classes/log.php
+++ b/classes/log.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -51,9 +51,21 @@ public static function _init()
try
{
// determine the name and location of the logfile
- $rootpath = \Config::get('log_path').date('Y').'/';
- $filepath = \Config::get('log_path').date('Y/m').'/';
- $filename = $filepath.date('d').'.php';
+ $path = \Config::get('log_path', APPPATH.'logs'.DS);
+ $filename = \Config::get('log_file', null);
+
+ if(empty($filename))
+ {
+ $rootpath = $path.date('Y').DS;
+ $filepath = $path.date('Y/m').DS;
+ $filename = $filepath.date('d').'.php';
+ }
+ else
+ {
+ $rootpath = $path;
+ $filepath = $path;
+ $filename = $path.$filename;
+ }
// get the required folder permissions
$permission = \Config::get('file.chmod.folders', 0777);
diff --git a/classes/markdown.php b/classes/markdown.php
index 47cde24cff..deaf77928e 100644
--- a/classes/markdown.php
+++ b/classes/markdown.php
@@ -6,16 +6,14 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
namespace Fuel\Core;
-use MarkdownExtra_Parser;
-
/**
- * This is a small wrapper around the MarkdownExtra_Parser class.
+ * This is a small wrapper around the Markdown composer package.
*
* @package Fuel
* @subpackage Core
@@ -23,7 +21,7 @@
class Markdown
{
/**
- * @var MarkdownExtra_Parser The MD parser instance
+ * @var MarkdownExtra The Markdown Extra parser instance
*/
protected static $parser = null;
@@ -34,12 +32,22 @@ class Markdown
*/
public static function _init()
{
- if ( ! class_exists('MarkdownExtra_Parser', false))
+ if ( ! class_exists('Michelf\MarkdownExtra'))
{
- include COREPATH.'vendor'.DS.'markdown'.DS.'markdown.php';
+ throw new \FuelException('The Markdown composer library isn\'t installed. Make sure it\'s in your "composer.json", then run "composer update" to install it!');
}
- static::$parser = new MarkdownExtra_Parser();
+ static::$parser = new \Michelf\MarkdownExtra();
+ }
+
+ /**
+ * Runs the Markdown parser instance, so you can pass custom configuration
+ *
+ * @return MarkdownExtra
+ */
+ public static function instance()
+ {
+ return static::$parser;
}
/**
diff --git a/classes/migrate.php b/classes/migrate.php
index 45aafa0a31..867298f321 100644
--- a/classes/migrate.php
+++ b/classes/migrate.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/model.php b/classes/model.php
index 7bcdb94c80..490cc170dd 100644
--- a/classes/model.php
+++ b/classes/model.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/model/crud.php b/classes/model/crud.php
index d3eaca4286..c27ab8929a 100644
--- a/classes/model/crud.php
+++ b/classes/model/crud.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -433,7 +433,7 @@ public function __set($property, $value)
*/
public function __get($property)
{
- if (isset($this->_data[$property]))
+ if (array_key_exists($property, $this->_data))
{
return $this->_sanitization_enabled ? \Security::clean($this->_data[$property], null, 'security.output_filter') : $this->_data[$property];
}
@@ -762,7 +762,7 @@ public function offsetSet($offset, $value)
*/
public function offsetExists($offset)
{
- return isset($this->_data[$offset]);
+ return array_key_exists($offset, $this->_data);
}
/**
@@ -784,7 +784,7 @@ public function offsetUnset($offset)
*/
public function offsetGet($offset)
{
- if (isset($this->_data[$offset]))
+ if (array_key_exists($offset, $this->_data))
{
return $this->_data[$offset];
}
diff --git a/classes/module.php b/classes/module.php
index ef998bd43c..12e6a8bc69 100644
--- a/classes/module.php
+++ b/classes/module.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/mongo/db.php b/classes/mongo/db.php
index 9328fa0e29..5abac12ff0 100644
--- a/classes/mongo/db.php
+++ b/classes/mongo/db.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -518,34 +518,28 @@ public function where_near($field = '', $co = array())
* s = dotall, "." matches everything, including newlines
* u = match unicode
*
- * @param $enable_start_wildcard
- * If set to anything other than TRUE, a starting line character "^" will be prepended
+ * @param $disable_start_wildcard
+ * If this value evaluates to false, no starting line character "^" will be prepended
* to the search value, representing only searching for a value at the start of
* a new line.
*
- * @param $enable_end_wildcard
- * If set to anything other than TRUE, an ending line character "$" will be appended
+ * @param $disable_end_wildcard
+ * If this value evaluates to false, no ending line character "$" will be appended
* to the search value, representing only searching for a value at the end of
* a line.
*
- * @usage $mongodb->like('foo', 'bar', 'im', false, TRUE);
+ * @usage $mongodb->like('foo', 'bar', 'im', false, true);
*/
- public function like($field = '', $value = '', $flags = 'i', $enable_start_wildcard = TRUE, $enable_end_wildcard = TRUE)
+ public function like($field = '', $value = '', $flags = 'i', $disable_start_wildcard = false, $disable_end_wildcard = false)
{
$field = (string) trim($field);
$this->_where_init($field);
+
$value = (string) trim($value);
$value = quotemeta($value);
- if ($enable_start_wildcard !== TRUE)
- {
- $value = '^' . $value;
- }
-
- if ($enable_end_wildcard !== TRUE)
- {
- $value .= '$';
- }
+ (bool) $disable_start_wildcard === false and $value = '^'.$value;
+ (bool) $disable_end_wildcard === false and $value .= '$';
$regex = "/$value/$flags";
$this->wheres[$field] = new \MongoRegex($regex);
@@ -1150,6 +1144,17 @@ public function get_collection($collection)
return ($this->db->{$collection});
}
+ /**
+ * Returns all collection objects
+ *
+ * @param bool $system_collections wether or not to include system collections
+ * @usage $collections = $mongodb->list_collections();
+ */
+ public function list_collections($system_collections = false)
+ {
+ return ($this->db->listCollections($system_collections));
+ }
+
/**
* Resets the class variables to default settings
*/
diff --git a/classes/num.php b/classes/num.php
index 0eb79a730e..076551ec48 100644
--- a/classes/num.php
+++ b/classes/num.php
@@ -6,7 +6,7 @@
* @version 1.6
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/package.php b/classes/package.php
index 07772e0388..4f387e1dcc 100644
--- a/classes/package.php
+++ b/classes/package.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/pagination.php b/classes/pagination.php
index d3ed96ddc8..de961243b5 100644
--- a/classes/pagination.php
+++ b/classes/pagination.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -132,6 +132,7 @@ public static function instance($name = null)
'show_first' => false,
'show_last' => false,
'pagination_url' => null,
+ 'link_offset' => 0.5,
);
/**
@@ -234,6 +235,8 @@ public function __set($name, $value = null)
}
else
{
+ $value = $this->_validate($name, $value);
+
if (array_key_exists($name, $this->config))
{
$this->config[$name] = $value;
@@ -295,13 +298,32 @@ public function pages_render()
$html = '';
- // let's get the starting page number, this is determined using num_links
- $start = (($this->config['calculated_page'] - $this->config['num_links']) > 0) ? $this->config['calculated_page'] - ($this->config['num_links'] - 1) : 1;
+ // calculate start- and end page numbers
+ $start = $this->config['calculated_page'] - floor($this->config['num_links'] * $this->config['link_offset']);
+ $end = $this->config['calculated_page'] + floor($this->config['num_links'] * ( 1 - $this->config['link_offset']));
+
+ // adjust for the first few pages
+ if ($start < 1)
+ {
+ $end -= $start - 1;
+ $start = 1;
+ }
- // let's get the ending page number
- $end = (($this->config['calculated_page'] + $this->config['num_links']) < $this->config['total_pages']) ? $this->config['calculated_page'] + $this->config['num_links'] : $this->config['total_pages'];
+ // make sure we don't overshoot the current page due to rounding issues
+ if ($end < $this->config['calculated_page'])
+ {
+ $start++;
+ $end++;
+ }
- for($i = $start; $i <= $end; $i++)
+ // make sure we don't overshoot the total
+ if ($end > $this->config['total_pages'])
+ {
+ $start = max(1, $start - $end + $this->config['total_pages']);
+ $end = $this->config['total_pages'];
+ }
+
+ for($i = intval($start); $i <= intval($end); $i++)
{
if ($this->config['calculated_page'] == $i)
{
@@ -581,7 +603,7 @@ protected function _make_link($page)
}
// re-assemble the url
- $query = empty($url['query']) ? '' : '?'.preg_replace('/%7Bpage%7D/', '{page}', http_build_query($url['query']));
+ $query = empty($url['query']) ? '' : '?'.preg_replace('/%7Bpage%7D/', '{page}', http_build_query($url['query'], '', '&'));
unset($url['query']);
empty($url['scheme']) or $url['scheme'] .= '://';
empty($url['port']) or $url['host'] .= ':';
@@ -592,4 +614,75 @@ protected function _make_link($page)
return str_replace('{page}', $page, $this->config['pagination_url']);
}
+ /**
+ * Validate the input configuration
+ */
+ protected function _validate($name, $value)
+ {
+ switch ($name)
+ {
+ case 'offset':
+ case 'total_items':
+ // make sure it's an integer
+ if ($value != intval($value))
+ {
+ $value = 0;
+ }
+ // and that it's within bounds
+ $value = max(0, $value);
+ break;
+
+ // integer or string
+ case 'uri_segment':
+ if (is_numeric($value))
+ {
+ // make sure it's an integer
+ if ($value != intval($value))
+ {
+ $value = 1;
+ }
+ // and that it's within bounds
+ $value = max(1, $value);
+ }
+ break;
+
+ // validate integer values
+ case 'current_page':
+ case 'per_page':
+ case 'limit':
+ case 'total_pages':
+ case 'num_links':
+ // make sure it's an integer
+ if ($value != intval($value))
+ {
+ $value = 1;
+ }
+ // and that it's within bounds
+ $value = max(1, $value);
+ break;
+
+ // validate booleans
+ case 'show_first':
+ case 'show_last':
+ if ( ! is_bool($value))
+ {
+ $value = (bool) $value;
+ }
+ break;
+
+ // validate the link offset, and adjust if needed
+ case 'link_offset':
+ // make sure we have a fraction between 0 and 1
+ if ($value > 1)
+ {
+ $value = $value / 100;
+ }
+
+ // and that it's within bounds
+ $value = max(0.01, min($value, 0.99));
+ break;
+ }
+
+ return $value;
+ }
}
diff --git a/classes/presenter.php b/classes/presenter.php
new file mode 100644
index 0000000000..79fb36beab
--- /dev/null
+++ b/classes/presenter.php
@@ -0,0 +1,331 @@
+module) : '';
+
+ // list of possible presenter classnames, start with the namespaced one
+ $classes = array($namespace.'\\'.static::$ns_prefix.$presenter);
+
+ // add the global version if needed
+ empty($namespace) or $classes[] = static::$ns_prefix.$presenter;
+
+ /**
+ * Add non prefixed classnames to the list, for BC reasons
+ *
+ * @deprecated 1.6
+ */
+ $classes[] = $namespace.'\\'.$presenter;
+
+ // and add the global version of that if needed
+ empty($namespace) or $classes[] = $presenter;
+
+ // check if we can find one
+ foreach ($classes as $class)
+ {
+ if (class_exists($class))
+ {
+ return new $class($method, $auto_filter, $view);
+ }
+ }
+
+ throw new \OutOfBoundsException('Presenter "'.reset($classes).'" could not be found.');
+ }
+
+ /**
+ * @var string method to execute when rendering
+ */
+ protected $_method;
+
+ /**
+ * @var string|View view name, after instantiation a View object
+ */
+ protected $_view;
+
+ /**
+ * @var bool whether or not to use auto filtering
+ */
+ protected $_auto_filter;
+
+ /**
+ * @var Request active request during Presenter creation for proper context
+ */
+ protected $_active_request;
+
+ protected function __construct($method, $auto_filter = null, $view = null)
+ {
+ $this->_auto_filter = $auto_filter;
+ $this->_view === null and $this->_view = $view;
+ class_exists('Request', false) and $this->_active_request = \Request::active();
+
+ if (empty($this->_view))
+ {
+ // Take the class name and guess the view name
+ $class = get_class($this);
+ $this->_view = strtolower(str_replace('_', DS, preg_replace('#^([a-z0-9_]*\\\\)?(View_)?#i', '', $class)));
+ }
+
+ $this->set_view();
+
+ $this->_method = $method;
+ }
+
+ /**
+ * Returns the View object associated with this Presenter
+ *
+ * @return View
+ */
+ public function get_view()
+ {
+ return $this->_view;
+ }
+
+ /**
+ * Construct the View object
+ */
+ protected function set_view()
+ {
+ $this->_view instanceOf View or $this->_view = \View::forge($this->_view);
+ }
+
+ /**
+ * Returns the active request object.
+ *
+ * @return Request
+ */
+ protected function request()
+ {
+ return $this->_active_request;
+ }
+
+ /**
+ * Executed before the view method
+ */
+ public function before() {}
+
+ /**
+ * The default view method
+ * Should set all expected variables upon itself
+ */
+ public function view() {}
+
+ /**
+ * Executed after the view method
+ */
+ public function after() {}
+
+ /**
+ * Fetches an existing value from the template
+ *
+ * @return mixed
+ */
+ public function & __get($name)
+ {
+ return $this->get($name);
+ }
+
+ /**
+ * Gets a variable from the template
+ *
+ * @param string
+ */
+ public function & get($key = null, $default = null)
+ {
+ if (is_null($default) and func_num_args() === 1)
+ {
+ return $this->_view->get($key);
+ }
+ return $this->_view->get($key, $default);
+ }
+
+ /**
+ * Sets and sanitizes a variable on the template
+ *
+ * @param string
+ * @param mixed
+ */
+ public function __set($key, $value)
+ {
+ return $this->set($key, $value);
+ }
+
+ /**
+ * Sets a variable on the template
+ *
+ * @param string
+ * @param mixed
+ * @param bool|null
+ */
+ public function set($key, $value = null, $filter = null)
+ {
+ is_null($filter) and $filter = $this->_auto_filter;
+ $this->_view->set($key, $value, $filter);
+
+ return $this;
+ }
+
+ /**
+ * The same as set(), except this defaults to not-encoding the variable
+ * on output.
+ *
+ * $view->set_safe('foo', 'bar');
+ *
+ * @param string variable name or an array of variables
+ * @param mixed value
+ * @return $this
+ */
+ public function set_safe($key, $value = null)
+ {
+ return $this->set($key, $value, false);
+ }
+
+ /**
+ * Magic method, determines if a variable is set.
+ *
+ * isset($view->foo);
+ *
+ * @param string variable name
+ * @return boolean
+ */
+ public function __isset($key)
+ {
+ return isset($this->_view->$key);
+ }
+
+ /**
+ * Magic method, unsets a given variable.
+ *
+ * unset($view->foo);
+ *
+ * @param string variable name
+ * @return void
+ */
+ public function __unset($key)
+ {
+ unset($this->_view->$key);
+ }
+
+ /**
+ * Assigns a value by reference. The benefit of binding is that values can
+ * be altered without re-setting them. It is also possible to bind variables
+ * before they have values. Assigned values will be available as a
+ * variable within the view file:
+ *
+ * $this->bind('ref', $bar);
+ *
+ * @param string variable name
+ * @param mixed referenced variable
+ * @param bool Whether to filter the var on output
+ * @return $this
+ */
+ public function bind($key, &$value, $filter = null)
+ {
+ $this->_view->bind($key, $value, $filter);
+
+ return $this;
+ }
+
+ /**
+ * Change auto filter setting
+ *
+ * @param null|bool change setting (bool) or get the current setting (null)
+ * @return void|bool returns current setting or nothing when it is changed
+ */
+ public function auto_filter($setting = null)
+ {
+ if (func_num_args() == 0)
+ {
+ return $this->_view->auto_filter();
+ }
+
+ return $this->_view->auto_filter($setting);
+ }
+
+
+ /**
+ * Add variables through method and after() and create template as a string
+ */
+ public function render()
+ {
+ if (class_exists('Request', false))
+ {
+ $current_request = Request::active();
+ Request::active($this->_active_request);
+ }
+
+ $this->before();
+ $this->{$this->_method}();
+ $this->after();
+
+ $return = $this->_view->render();
+
+ if (class_exists('Request', false))
+ {
+ Request::active($current_request);
+ }
+
+ return $return;
+ }
+
+ /**
+ * Auto-render on toString
+ */
+ public function __toString()
+ {
+ try
+ {
+ return $this->render();
+ }
+ catch (\Exception $e)
+ {
+ \Error::exception_handler($e);
+
+ return '';
+ }
+ }
+}
+
+
diff --git a/classes/profiler.php b/classes/profiler.php
index 4b10c0d19e..e776477f17 100644
--- a/classes/profiler.php
+++ b/classes/profiler.php
@@ -66,7 +66,7 @@ public static function stop($text)
if (static::$profiler)
{
static::$query['time'] = (static::$profiler->getMicroTime() - static::$query['time']) *1000;
- array_push(static::$profiler->queries, static::$query);
+ static::$profiler->queries[] = static::$query;
static::$profiler->queryCount++;
}
}
diff --git a/classes/redis/db.php b/classes/redis/db.php
index 7ab306aeff..36fbc6824e 100644
--- a/classes/redis/db.php
+++ b/classes/redis/db.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/request.php b/classes/request.php
index 7e3255861b..e08130ae47 100644
--- a/classes/request.php
+++ b/classes/request.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/request/curl.php b/classes/request/curl.php
index bf3c3be62f..882780af0a 100644
--- a/classes/request/curl.php
+++ b/classes/request/curl.php
@@ -2,6 +2,16 @@
namespace Fuel\Core;
+
+/**
+ * Request_Curl Class
+ *
+ * Curl driver for Requests
+ *
+ * @package Fuel\Core
+ *
+ */
+
class Request_Curl extends \Request_Driver
{
/**
@@ -143,7 +153,7 @@ public function execute(array $additional_params = array())
// Execute the request & and hide all output
$body = curl_exec($connection);
$this->response_info = curl_getinfo($connection);
- $mime = isset($this->headers['Accept']) ? $this->headers['Accept'] : $this->response_info('content_type', 'text/plain');
+ $mime = $this->response_info('content_type', 'text/plain');
// Was header data requested?
$headers = array();
@@ -164,7 +174,7 @@ public function execute(array $additional_params = array())
}
}
- $this->set_response($body, $this->response_info('http_code', 200), $mime, $headers);
+ $this->set_response($body, $this->response_info('http_code', 200), $mime, $headers, isset($this->headers['Accept']) ? $this->headers['Accept'] : null);
// Request failed
if ($body === false)
diff --git a/classes/request/driver.php b/classes/request/driver.php
index d1bbc82ad3..0a44ccdab4 100644
--- a/classes/request/driver.php
+++ b/classes/request/driver.php
@@ -62,7 +62,7 @@ public static function forge($resource, array $options = array(), $method = null
/**
* @var bool whether to attempt auto-formatting the response
*/
- protected $auto_format = true;
+ protected $auto_format = false;
/**
* @var string $method request method
@@ -85,6 +85,7 @@ public static function forge($resource, array $options = array(), $method = null
*/
protected static $auto_detect_formats = array(
'application/xml' => 'xml',
+ 'application/soap+xml' => 'xml',
'text/xml' => 'xml',
'application/json' => 'json',
'text/json' => 'json',
@@ -280,6 +281,59 @@ protected function set_defaults()
return $this;
}
+ /**
+ * Validate if a given mime type is accepted according to an accept header
+ *
+ * @param string $mime
+ * @param string $accept_header
+ * @return bool
+ */
+ protected function mime_in_header($mime, $accept_header)
+ {
+ // make sure we have input
+ if (empty($mime) or empty($accept_header))
+ {
+ // no header or no mime to check
+ return true;
+ }
+
+ // process the accept header and get a list of accepted mimes
+ $accept_mimes = array();
+ $accept_header = explode(',', $accept_header);
+ foreach ($accept_header as $accept_def)
+ {
+ $accept_def = explode(';', $accept_def);
+ $accept_def = trim($accept_def[0]);
+ if ( ! in_array($accept_def, $accept_mimes))
+ {
+ $accept_mimes[] = $accept_def;
+ }
+ }
+
+ // match on generic mime type
+ if (in_array('*/*', $accept_mimes))
+ {
+ return true;
+ }
+
+ // match on full mime type
+ if (in_array($mime, $accept_mimes))
+ {
+ return true;
+ }
+
+ // match on generic mime type
+ $mime = substr($mime, 0, strpos($mime, '/')).'/*';
+ if (in_array($mime, $accept_mimes))
+ {
+ return true;
+ }
+
+ // no match
+ return false;
+ }
+
+
/**
* Creates the Response and optionally attempts to auto-format the output
*
@@ -287,16 +341,27 @@ protected function set_defaults()
* @param int $status
* @param string $mime
* @param array $headers
+ * @param string $accept_header
* @return Response
+ *
+ * @throws OutOfRangeException if an accept header was specified, but the mime type isn't in it
*/
- public function set_response($body, $status, $mime = null, $headers = array())
+ public function set_response($body, $status, $mime = null, $headers = array(), $accept_header = null)
{
+ // did we use an accept header? If so, validate the returned mimetype
+ if ( ! $this->mime_in_header($mime, $accept_header))
+ {
+ throw new \OutOfRangeException('The mimetype "'.$mime.'" of the returned response is not acceptable according to the accept header send.');
+ }
+
+ // do we have auto formatting enabled and can we format this mime type?
if ($this->auto_format and array_key_exists($mime, static::$auto_detect_formats))
{
$body = \Format::forge($body, static::$auto_detect_formats[$mime])->to_array();
}
$this->response = \Response::forge($body, $status, $headers);
+
return $this->response;
}
diff --git a/classes/request/soap.php b/classes/request/soap.php
index 3677c5b49b..5bd732f112 100644
--- a/classes/request/soap.php
+++ b/classes/request/soap.php
@@ -2,6 +2,15 @@
namespace Fuel\Core;
+/**
+ * Request_Soap Class
+ *
+ * Soap driver for Requests
+ *
+ * @package Fuel\Core
+ *
+ */
+
class Request_Soap extends \Request_Driver
{
protected static $wsdl_settings = array('wsdl', 'classmap', 'cache_wsdl');
@@ -121,8 +130,9 @@ public function execute(array $additional_params = array())
{
$body = $this->connection()->__soapCall($this->function, $this->params, array(), $this->get_headers(), $headers);
$this->response_info = $headers;
- $mime = isset($this->headers['Accept']) ? $this->headers['Accept'] : null;
- $this->set_response($body, $this->response_info('http_code', 200), $mime, $headers);
+
+ $mime = $this->response_info('content_type', 'application/soap+xml');
+ $this->set_response($body, $this->response_info('http_code', 200), $mime, $headers, isset($this->headers['Accept']) ? $this->headers['Accept'] : null);
$this->set_defaults();
return $this;
diff --git a/classes/response.php b/classes/response.php
index 2d7909c5b9..9bae57bbb9 100644
--- a/classes/response.php
+++ b/classes/response.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -68,7 +68,7 @@ class Response
424 => 'Failed Dependency',
426 => 'Upgrade Required',
428 => 'Precondition Required',
- 428 => 'Too Many Requests',
+ 429 => 'Too Many Requests',
431 => 'Request Header Fields Too Large',
500 => 'Internal Server Error',
501 => 'Not Implemented',
diff --git a/classes/route.php b/classes/route.php
index 3b7ee517d3..f1a75340d0 100644
--- a/classes/route.php
+++ b/classes/route.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -45,6 +45,11 @@ class Route
*/
public $strip_extension = true;
+ /**
+ * @var string route name
+ */
+ public $name = null;
+
/**
* @var string route module
*/
@@ -80,13 +85,14 @@ class Route
*/
protected $search = null;
- public function __construct($path, $translation = null, $case_sensitive = null, $strip_extension = null)
+ public function __construct($path, $translation = null, $case_sensitive = null, $strip_extension = null, $name = null)
{
$this->path = $path;
$this->translation = ($translation === null) ? $path : $translation;
$this->search = ($translation == stripslashes($path)) ? $path : $this->compile();
$this->case_sensitive = ($case_sensitive === null) ? \Config::get('routing.case_sensitive', true) : $case_sensitive;
$this->strip_extension = ($strip_extension === null) ? \Config::get('routing.strip_extension', true) : $strip_extension;
+ $this->name = $name;
}
/**
diff --git a/classes/router.php b/classes/router.php
index 324ffda66e..9b9109f021 100644
--- a/classes/router.php
+++ b/classes/router.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -70,11 +70,11 @@ public static function add($path, $options = null, $prepend = false, $case_sensi
if ($prepend)
{
- \Arr::prepend(static::$routes, $name, new \Route($path, $options, $case_sensitive));
+ \Arr::prepend(static::$routes, $name, new \Route($path, $options, $case_sensitive, $name));
return;
}
- static::$routes[$name] = new \Route($path, $options, $case_sensitive);
+ static::$routes[$name] = new \Route($path, $options, $case_sensitive, $name);
}
/**
@@ -124,7 +124,7 @@ public static function get($name, $named_params = array())
{
$replace = $named_params[$key];
}
-
+
if (($pos = strpos($url, $target)) !== false)
{
$url = substr_replace($url, $replace, $pos, strlen($target));
@@ -256,26 +256,38 @@ protected static function parse_match($match)
protected static function parse_segments($segments, $namespace = '', $module = false)
{
$temp_segments = $segments;
+ $prefix = static::get_prefix();
foreach (array_reverse($segments, true) as $key => $segment)
{
- $class = $namespace.static::$prefix.\Inflector::words_to_upper(implode('_', $temp_segments));
+ // determine which classes to check. First, all underscores, or all namespaced
+ $classes = array(
+ $namespace.$prefix.\Inflector::words_to_upper(implode(substr($prefix,-1,1), $temp_segments), substr($prefix,-1,1)),
+ );
+
+ // if we're namespacing, check a hybrid version too
+ $classes[] = $namespace.$prefix.\Inflector::words_to_upper(implode('_', $temp_segments));
+
array_pop($temp_segments);
- if (class_exists($class))
+
+ foreach ($classes as $class)
{
- return array(
- 'controller' => $class,
- 'action' => isset($segments[$key + 1]) ? $segments[$key + 1] : null,
- 'method_params' => array_slice($segments, $key + 2),
- );
+ if (static::check_class($class))
+ {
+ return array(
+ 'controller' => $class,
+ 'action' => isset($segments[$key + 1]) ? $segments[$key + 1] : null,
+ 'method_params' => array_slice($segments, $key + 2),
+ );
+ }
}
}
// Fall back for default module controllers
if ($module)
{
- $class = $namespace.static::$prefix.ucfirst($module);
- if (class_exists($class))
+ $class = $namespace.$prefix.ucfirst($module);
+ if (static::check_class($class))
{
return array(
'controller' => $class,
@@ -286,6 +298,27 @@ protected static function parse_segments($segments, $namespace = '', $module = f
}
return false;
}
+
+ /**
+ * Checks whether class exists.
+ *
+ * @param string $class The class name to check.
+ * @return bool True if $class exists, false otherwise.
+ */
+ protected static function check_class($class)
+ {
+ return class_exists($class);
+ }
+
+ /**
+ * Get prefix.
+ *
+ * @return string Prefix as defined in config controller_prefix.
+ */
+ protected static function get_prefix()
+ {
+ return static::$prefix;
+ }
}
diff --git a/classes/sanitization.php b/classes/sanitization.php
index 3f5e44cea5..0c592fe67c 100644
--- a/classes/sanitization.php
+++ b/classes/sanitization.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/security.php b/classes/security.php
index f14e9e5ef4..be3a5bd601 100644
--- a/classes/security.php
+++ b/classes/security.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/session.php b/classes/session.php
index d315dbdd29..49c4e9a6ac 100644
--- a/classes/session.php
+++ b/classes/session.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -65,6 +65,47 @@ public static function _init()
{
static::instance();
}
+
+ if (\Config::get('session.native_emulation', false))
+ {
+ // emulate native PHP sessions
+ session_set_save_handler (
+ // open
+ function ($savePath, $sessionName) {
+ },
+ // close
+ function () {
+ },
+ // read
+ function ($sessionId) {
+ // copy all existing session vars into the PHP session store
+ $_SESSION = \Session::get();
+ $_SESSION['__org'] = $_SESSION;
+ },
+ // write
+ function ($sessionId, $data) {
+ // get the original data
+ $org = isset($_SESSION['__org']) ? $_SESSION['__org'] : array();
+ unset($_SESSION['__org']);
+
+ // do we need to remove stuff?
+ if ($remove = array_diff_key($org, $_SESSION))
+ {
+ \Session::delete(array_keys($remove));
+ }
+
+ // add or update the remainder
+ empty($_SESSION) or \Session::set($_SESSION);
+ },
+ // destroy
+ function ($sessionId) {
+ \Session::destroy();
+ },
+ // gc
+ function ($lifetime) {
+ }
+ );
+ }
}
// --------------------------------------------------------------------
@@ -223,7 +264,7 @@ public static function delete($name)
*/
public static function key($name = 'session_id')
{
- return static::instance()->key($name);
+ return static::$_instance ? static::instance()->key($name) : null;
}
// --------------------------------------------------------------------
diff --git a/classes/session/cookie.php b/classes/session/cookie.php
index 2a8faf7907..94c694fda4 100644
--- a/classes/session/cookie.php
+++ b/classes/session/cookie.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -77,25 +77,29 @@ public function read($force = false)
$payload = $this->_get_cookie();
// validate it
- if ($payload === false or $force )
+ if ($force)
{
- // not a valid cookie, or a forced session reset
+ // a forced session reset
+ }
+ elseif ($payload === false)
+ {
+ // no cookie found
}
elseif ( ! isset($payload[0]) or ! is_array($payload[0]))
{
- // not a valid cookie payload
+ logger('DEBUG', 'Error: not a valid cookie payload!');
}
elseif ($payload[0]['updated'] + $this->config['expiration_time'] <= $this->time->get_timestamp())
{
- // session has expired
+ logger('DEBUG', 'Error: session id has expired!');
}
elseif ($this->config['match_ip'] and $payload[0]['ip_hash'] !== md5(\Input::ip().\Input::real_ip()))
{
- // IP address doesn't match
+ logger('DEBUG', 'Error: IP address in the session doesn\'t match this requests source IP!');
}
elseif ($this->config['match_ua'] and $payload[0]['user_agent'] !== \Input::user_agent())
{
- // user agent doesn't match
+ logger('DEBUG', 'Error: User agent in the session doesn\'t match the browsers user agent string!');
}
else
{
diff --git a/classes/session/db.php b/classes/session/db.php
index 707b5cda55..7cec1a0aea 100644
--- a/classes/session/db.php
+++ b/classes/session/db.php
@@ -6,14 +6,12 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
namespace Fuel\Core;
-
-
// --------------------------------------------------------------------
class Session_Db extends \Session_Driver
@@ -111,25 +109,26 @@ public function read($force = false)
else
{
// cookie present, but session record missing. force creation of a new session
+ logger('DEBUG', 'Error: Session cookie with ID "'.$cookie[0].'" present but corresponding record is missing');
return $this->read(true);
}
}
if ( ! isset($payload[0]) or ! is_array($payload[0]))
{
- // not a valid cookie payload
+ logger('DEBUG', 'Error: not a valid db session payload!');
}
elseif ($payload[0]['updated'] + $this->config['expiration_time'] <= $this->time->get_timestamp())
{
- // session has expired
+ logger('DEBUG', 'Error: session id has expired!');
}
elseif ($this->config['match_ip'] and $payload[0]['ip_hash'] !== md5(\Input::ip().\Input::real_ip()))
{
- // IP address doesn't match
+ logger('DEBUG', 'Error: IP address in the session doesn\'t match this requests source IP!');
}
elseif ($this->config['match_ua'] and $payload[0]['user_agent'] !== \Input::user_agent())
{
- // user agent doesn't match
+ logger('DEBUG', 'Error: User agent in the session doesn\'t match the browsers user agent string!');
}
else
{
@@ -164,38 +163,76 @@ public function write()
// record the last update time of the session
$this->keys['updated'] = $this->time->get_timestamp();
+ // add a random identifier, we need the payload to be absolutely unique
+ $this->flash[$this->config['flash_id'].'::__session_identifier__'] = array('state' => 'expire', 'value' => sha1(uniqid(rand(), true)));
+
// create the session record, and add the session payload
$session = $this->keys;
$session['payload'] = $this->_serialize(array($this->keys, $this->data, $this->flash));
- // do we need to create a new session?
- if (is_null($this->record))
+ try
{
- // create the new session record
- $result = \DB::insert($this->config['table'], array_keys($session))->values($session)->execute($this->config['database']);
- }
- else
- {
- // update the database
- $result = \DB::update($this->config['table'])->set($session)->where('session_id', '=', $this->record->get('session_id'))->execute($this->config['database']);
- }
+ // do we need to create a new session?
+ if (is_null($this->record))
+ {
+ // create the new session record
+ list($notused, $result) = \DB::insert($this->config['table'], array_keys($session))->values($session)->execute($this->config['database']);
+ }
+ else
+ {
+ // update the database
+ $result = \DB::update($this->config['table'])->set($session)->where('session_id', '=', $this->record->get('session_id'))->execute($this->config['database']);
+
+ // if it failed, perhaps we have lost a session id due to rotation?
+ if ($result === 0)
+ {
+ // if so, there must be a session record with our session_id as previous_id
+ $result = \DB::select()->where('previous_id', '=', $this->record->get('session_id'))->from($this->config['table'])->execute($this->config['database']);
+ if ($result->count())
+ {
+ logger(\Fuel::L_WARNING, 'Session update failed, session record recovered using previous id. Lost rotation data?');
- // update went well?
- if ($result !== false)
- {
- // then update the cookie
- $this->_set_cookie(array($this->keys['session_id']));
+ // update the session data
+ $this->keys['session_id'] = $result->get('session_id');
+ $this->keys['previous_id'] = $result->get('previous_id');
+
+ // and recreate the payload
+ $session = $this->keys;
+ $session['payload'] = $this->_serialize(array($this->keys, $this->data, $this->flash));
+
+ // and update the database
+ $result = \DB::update($this->config['table'])->set($session)->where('session_id', '=', $this->keys['session_id'])->execute($this->config['database']);
+ }
+ else
+ {
+ logger(\Fuel::L_ERROR, 'Session update failed, session record could not be recovered using the previous id');
+ $result = false;
+ }
+ }
+ }
+
+ // update went well?
+ if ($result !== 0)
+ {
+ // then update the cookie
+ $this->_set_cookie(array($this->keys['session_id']));
+ }
+
+ // do some garbage collection
+ if (mt_rand(0,100) < $this->config['gc_probability'])
+ {
+ $expired = $this->time->get_timestamp() - $this->config['expiration_time'];
+ $result = \DB::delete($this->config['table'])->where('updated', '<', $expired)->execute($this->config['database']);
+ }
}
- else
+ catch (Database_Exception $e)
{
- logger(\Fuel::L_ERROR, 'Session update failed, session record could not be found. Concurrency issue?');
- }
+ // strip the actual query from the message
+ $msg = $e->getMessage();
+ $msg = substr($msg, 0, strlen($msg) - strlen(strrchr($msg, ':')));
- // do some garbage collection
- if (mt_rand(0,100) < $this->config['gc_probability'])
- {
- $expired = $this->time->get_timestamp() - $this->config['expiration_time'];
- $result = \DB::delete($this->config['table'])->where('updated', '<', $expired)->execute($this->config['database']);
+ // and rethrow it
+ throw new \Database_Exception($msg);
}
}
diff --git a/classes/session/driver.php b/classes/session/driver.php
index fcc9732601..e65aa54490 100644
--- a/classes/session/driver.php
+++ b/classes/session/driver.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -68,7 +68,7 @@ abstract function create();
public function destroy()
{
// delete the session cookie
- \Cookie::delete($this->config['cookie_name']);
+ \Cookie::delete($this->config['cookie_name'], $this->config['cookie_path'], $this->config['cookie_domain'], null, $this->config['cookie_http_only']);
// reset the stored session data
$this->keys = $this->flash = $this->data = array();
@@ -254,7 +254,14 @@ public function set_flash($name, $value)
if ($keys)
{
- isset($this->flash[$this->config['flash_id'].'::'.$name]['value']) or $this->flash[$this->config['flash_id'].'::'.$name] = array('state' => 'new', 'value' => array());
+ if (isset($this->flash[$this->config['flash_id'].'::'.$name]['value']))
+ {
+ $this->flash[$this->config['flash_id'].'::'.$name]['state'] = 'new';
+ }
+ else
+ {
+ $this->flash[$this->config['flash_id'].'::'.$name] = array('state' => 'new', 'value' => array());
+ }
\Arr::set($this->flash[$this->config['flash_id'].'::'.$name]['value'], $keys[0], $value);
}
else
@@ -526,16 +533,16 @@ protected function _get_cookie()
$cookie = \Cookie::get($this->config['cookie_name'], false);
}
- // if not found, check the URL for a cookie
+ // if not found, was a session-id present in the HTTP header?
if ($cookie === false)
{
- $cookie = \Input::get($this->config['cookie_name'], false);
+ $cookie = \Input::headers($this->config['http_header_name'], false);
}
- // if not found, was a session-id present in the HTTP header?
+ // if not found, check the URL for a cookie
if ($cookie === false)
{
- $cookie = \Input::headers($this->config['header_header_name'], false);
+ $cookie = \Input::get($this->config['cookie_name'], false);
}
if ($cookie !== false)
@@ -552,6 +559,7 @@ protected function _get_cookie()
($this->config['driver'] !== 'cookie' and ! is_string($cookie[0])))
{
// invalid specific format
+ logger('DEBUG', 'Error: Invalid session cookie specific format');
$cookie = false;
}
}
@@ -565,6 +573,7 @@ protected function _get_cookie()
// invalid general format
else
{
+ logger('DEBUG', 'Error: Invalid session cookie general format');
$cookie = false;
}
}
diff --git a/classes/session/exception.php b/classes/session/exception.php
index f193f0887f..08465e133d 100644
--- a/classes/session/exception.php
+++ b/classes/session/exception.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/session/file.php b/classes/session/file.php
index 0181cc2052..d7fa002af4 100644
--- a/classes/session/file.php
+++ b/classes/session/file.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -111,19 +111,19 @@ public function read($force = false)
if ( ! isset($payload[0]) or ! is_array($payload[0]))
{
- // not a valid cookie payload
+ logger('DEBUG', 'Error: not a valid session file payload!');
}
elseif ($payload[0]['updated'] + $this->config['expiration_time'] <= $this->time->get_timestamp())
{
- // session has expired
+ logger('DEBUG', 'Error: session id has expired!');
}
elseif ($this->config['match_ip'] and $payload[0]['ip_hash'] !== md5(\Input::ip().\Input::real_ip()))
{
- // IP address doesn't match
+ logger('DEBUG', 'Error: IP address in the session doesn\'t match this requests source IP!');
}
elseif ($this->config['match_ua'] and $payload[0]['user_agent'] !== \Input::user_agent())
{
- // user agent doesn't match
+ logger('DEBUG', 'Error: User agent in the session doesn\'t match the browsers user agent string!');
}
else
{
diff --git a/classes/session/memcached.php b/classes/session/memcached.php
index 8728b0c405..ac477af419 100644
--- a/classes/session/memcached.php
+++ b/classes/session/memcached.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -155,19 +155,19 @@ public function read($force = false)
if ( ! isset($payload[0]) or ! is_array($payload[0]))
{
- // not a valid cookie payload
+ logger('DEBUG', 'Error: not a valid memcached payload!');
}
elseif ($payload[0]['updated'] + $this->config['expiration_time'] <= $this->time->get_timestamp())
{
- // session has expired
+ logger('DEBUG', 'Error: session id has expired!');
}
elseif ($this->config['match_ip'] and $payload[0]['ip_hash'] !== md5(\Input::ip().\Input::real_ip()))
{
- // IP address doesn't match
+ logger('DEBUG', 'Error: IP address in the session doesn\'t match this requests source IP!');
}
elseif ($this->config['match_ua'] and $payload[0]['user_agent'] !== \Input::user_agent())
{
- // user agent doesn't match
+ logger('DEBUG', 'Error: User agent in the session doesn\'t match the browsers user agent string!');
}
else
{
diff --git a/classes/session/redis.php b/classes/session/redis.php
index 94855e9791..8fe5c735dd 100644
--- a/classes/session/redis.php
+++ b/classes/session/redis.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -133,19 +133,19 @@ public function read($force = false)
if ( ! isset($payload[0]) or ! is_array($payload[0]))
{
- // not a valid cookie payload
+ logger('DEBUG', 'Error: not a valid redis session payload!');
}
elseif ($payload[0]['updated'] + $this->config['expiration_time'] <= $this->time->get_timestamp())
{
- // session has expired
+ logger('DEBUG', 'Error: session id has expired!');
}
elseif ($this->config['match_ip'] and $payload[0]['ip_hash'] !== md5(\Input::ip().\Input::real_ip()))
{
- // IP address doesn't match
+ logger('DEBUG', 'Error: IP address in the session doesn\'t match this requests source IP!');
}
elseif ($this->config['match_ua'] and $payload[0]['user_agent'] !== \Input::user_agent())
{
- // user agent doesn't match
+ logger('DEBUG', 'Error: User agent in the session doesn\'t match the browsers user agent string!');
}
else
{
diff --git a/classes/str.php b/classes/str.php
index 17c2f19328..cd3c9f6480 100644
--- a/classes/str.php
+++ b/classes/str.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -39,6 +39,16 @@ public static function truncate($string, $limit, $continuation = '...', $is_html
{
// Handle special characters.
preg_match_all('/&[a-z]+;/i', strip_tags($string), $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
+ // fix preg_match_all broken multibyte support
+ if (strlen($string !== mb_strlen($string)))
+ {
+ $correction = 0;
+ foreach ($matches as $index => $match)
+ {
+ $matches[$index][0][1] -= $correction;
+ $correction += (strlen($match[0][0]) - mb_strlen($match[0][0]));
+ }
+ }
foreach ($matches as $match)
{
if ($match[0][1] >= $limit)
@@ -50,6 +60,17 @@ public static function truncate($string, $limit, $continuation = '...', $is_html
// Handle all the html tags.
preg_match_all('/<[^>]+>([^<]*)/', $string, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
+ // fix preg_match_all broken multibyte support
+ if (strlen($string !== mb_strlen($string)))
+ {
+ $correction = 0;
+ foreach ($matches as $index => $match)
+ {
+ $matches[$index][0][1] -= $correction;
+ $matches[$index][1][1] -= $correction;
+ $correction += (strlen($match[0][0]) - mb_strlen($match[0][0]));
+ }
+ }
foreach ($matches as $match)
{
if($match[0][1] - $offset >= $limit)
diff --git a/classes/testcase.php b/classes/testcase.php
index f7d94f9e7a..3105a48cac 100644
--- a/classes/testcase.php
+++ b/classes/testcase.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -16,4 +16,4 @@
* A Fuel Specific extension of the PHPUnit TestCase. This will
* be used for custom functionality in the future.
*/
-class TestCase extends \PHPUnit_Framework_TestCase { }
+abstract class TestCase extends \PHPUnit_Framework_TestCase { }
diff --git a/classes/theme.php b/classes/theme.php
index 5970ec846b..c9b1688a60 100644
--- a/classes/theme.php
+++ b/classes/theme.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -128,7 +128,7 @@ public function __construct(array $config = array())
if (empty($config))
{
\Config::load('theme', true, false, true);
- $config = \Config::get('theme', false);
+ $config = \Config::get('theme', array());
}
// Order of this addition is important, do not change this.
@@ -219,10 +219,26 @@ public function view($view, $data = array(), $auto_filter = null)
* @param string Method to execute
* @param bool $auto_filter Auto filter the view data
* @return View New View object
+ *
+ * @deprecated 1.8
*/
public function viewmodel($view, $method = 'view', $auto_filter = null)
{
- return \ViewModel::forge($view, $method, $auto_filter, $this->find_file($view));
+ return \Viewmodel::forge($view, $method, $auto_filter, $this->find_file($view));
+ }
+
+ /**
+ * Loads a presenter, and have it use the view from the currently active theme,
+ * the fallback theme, or the standard FuelPHP cascading file system
+ *
+ * @param string Presenter classname without Presenter_ prefix or full classname
+ * @param string Method to execute
+ * @param bool $auto_filter Auto filter the view data
+ * @return View New View object
+ */
+ public function presenter($view, $method = 'view', $auto_filter = null)
+ {
+ return \Presenter::forge($view, $method, $auto_filter, $this->find_file($view));
}
/**
@@ -338,9 +354,9 @@ public function render()
/**
* Sets a partial for the current template
*
- * @param string $section Name of the partial section in the template
- * @param string|View|ViewModel $view View, or name of the view
- * @param bool $overwrite If true overwrite any already defined partials for this section
+ * @param string $section Name of the partial section in the template
+ * @param string|View|ViewModel|Presenter $view View, or name of the view
+ * @param bool $overwrite If true overwrite any already defined partials for this section
* @return View
*/
public function set_partial($section, $view, $overwrite = false)
@@ -418,11 +434,11 @@ public function partial_count($section)
/**
* Sets a chrome for a partial
*
- * @param string $section Name of the partial section in the template
- * @param string|View|ViewModel $view chrome View, or name of the view
- * @param string $var Name of the variable in the chome that will output the partial
+ * @param string $section Name of the partial section in the template
+ * @param string|View|ViewModel|Presenter $view chrome View, or name of the view
+ * @param string $var Name of the variable in the chome that will output the partial
*
- * @return View|ViewModel, the view partial
+ * @return View|ViewModel|Presenter, the view partial
*/
public function set_chrome($section, $view, $var = 'content')
{
@@ -440,9 +456,9 @@ public function set_chrome($section, $view, $var = 'content')
/**
* Get a set chrome view
*
- * @param string $section Name of the partial section in the template
- * @param string|View|ViewModel $view chrome View, or name of the view
- * @param string $var Name of the variable in the chome that will output the partial
+ * @param string $section Name of the partial section in the template
+ * @param string|View|ViewModel|Presenter $view chrome View, or name of the view
+ * @param string $var Name of the variable in the chome that will output the partial
*
* @return void
*/
@@ -657,7 +673,7 @@ public function save_info($type = 'active')
throw new \ThemeException(sprintf('Could not find theme "%s".', $theme['name']));
}
- if ( ! ($file = $this->find_file($this->config['info_file_name'], array($theme['name']))))
+ if ( ! ($file = $this->find_file($this->config['info_file_name'], array($theme))))
{
throw new \ThemeException(sprintf('Theme "%s" is missing "%s".', $theme['name'], $this->config['info_file_name']));
}
diff --git a/classes/unzip.php b/classes/unzip.php
index 1b5f3ad948..f434cba339 100644
--- a/classes/unzip.php
+++ b/classes/unzip.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/upload.php b/classes/upload.php
index d651517479..8c617bc246 100644
--- a/classes/upload.php
+++ b/classes/upload.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/uri.php b/classes/uri.php
index d65e3510df..18c139b386 100644
--- a/classes/uri.php
+++ b/classes/uri.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -152,7 +152,7 @@ public static function string()
public static function create($uri = null, $variables = array(), $get_variables = array(), $secure = null)
{
$url = '';
- $uri = $uri ?: static::string();
+ is_null($uri) and $uri = static::string();
// If the given uri is not a full URL
if( ! preg_match("#^(http|https|ftp)://#i", $uri))
@@ -166,10 +166,14 @@ public static function create($uri = null, $variables = array(), $get_variables
}
$url .= ltrim($uri, '/');
- // Add a url_suffix if defined and the url doesn't already have one
- if (substr($url, -1) != '/' and (($suffix = strrchr($url, '.')) === false or strlen($suffix) > 5))
+ // stick a url suffix onto it if defined and needed
+ if ($url_suffix = \Config::get('url_suffix', false) and substr($url, -1) != '/')
{
- \Config::get('url_suffix') and $url .= \Config::get('url_suffix');
+ $current_suffix = strrchr($url, '.');
+ if ( ! $current_suffix or strpos($current_suffix, '/') !== false)
+ {
+ $url .= $url_suffix;
+ }
}
if ( ! empty($get_variables))
diff --git a/classes/validation.php b/classes/validation.php
index f13c49d367..c8c162ba7f 100644
--- a/classes/validation.php
+++ b/classes/validation.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -475,7 +475,7 @@ protected function _run_rule($rule, &$value, $params, $field)
$output = call_fuel_func_array(reset($rule), array_merge(array($value), $params));
- if ($output === false && $value !== false)
+ if ($output === false and ($value !== false or key($rule) == 'required'))
{
throw new \Validation_Error($field, $value, $rule, $params);
}
@@ -769,6 +769,24 @@ public function _validation_match_field($val, $field)
return true;
}
+ /**
+ * Match against an array of values
+ *
+ * @param string
+ * @param array
+ * @return bool
+ */
+ public function _validation_match_collection($val, $collection = array())
+ {
+ if ( ! is_array($collection))
+ {
+ $collection = func_get_args();
+ array_shift($collection);
+ }
+
+ return in_array($val, $collection);
+ }
+
/**
* Minimum string length
*
@@ -903,9 +921,13 @@ public function _validation_valid_string($val, $flags = array('alpha', 'utf8'))
{
$flags = array('singlequotes', 'doublequotes');
}
+ elseif ($flags == 'slashes')
+ {
+ $flags = array('forwardslashes', 'backslashes');
+ }
elseif ($flags == 'all')
{
- $flags = array('alpha', 'utf8', 'numeric', 'spaces', 'newlines', 'tabs', 'punctuation', 'singlequotes', 'doublequotes', 'dashes', 'brackets', 'braces');
+ $flags = array('alpha', 'utf8', 'numeric', 'spaces', 'newlines', 'tabs', 'punctuation', 'singlequotes', 'doublequotes', 'dashes', 'forwardslashes', 'backslashes', 'brackets', 'braces');
}
else
{
@@ -923,6 +945,8 @@ public function _validation_valid_string($val, $flags = array('alpha', 'utf8'))
$pattern .= in_array('commas', $flags) && ! in_array('punctuation', $flags) ? ',' : '';
$pattern .= in_array('punctuation', $flags) ? "\.,\!\?:;\&" : '';
$pattern .= in_array('dashes', $flags) ? '_\-' : '';
+ $pattern .= in_array('forwardslashes', $flags) ? '\/' : '';
+ $pattern .= in_array('backslashes', $flags) ? '\\\\' : '';
$pattern .= in_array('singlequotes', $flags) ? "'" : '';
$pattern .= in_array('doublequotes', $flags) ? "\"" : '';
$pattern .= in_array('brackets', $flags) ? "\(\)" : '';
diff --git a/classes/validation/error.php b/classes/validation/error.php
index 170d112b30..394e30204b 100644
--- a/classes/validation/error.php
+++ b/classes/validation/error.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/classes/view.php b/classes/view.php
index 9e422fb138..288fe615e5 100644
--- a/classes/view.php
+++ b/classes/view.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -127,7 +127,7 @@ public function __construct($file = null, $data = null, $filter = null)
}
// store the current request search paths to deal with out-of-context rendering
- if (class_exists('Request', false) and $active = \Request::active() and \Request::main() != $active)
+ if (class_exists('Request', false) and $active = \Request::active() and \Request::main() !== $active)
{
$this->request_paths = $active->get_paths();
}
diff --git a/classes/viewmodel.php b/classes/viewmodel.php
index 252cbc3326..64ac616cd0 100644
--- a/classes/viewmodel.php
+++ b/classes/viewmodel.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -14,288 +14,14 @@
/**
- * ViewModel
+ * ViewModel, alias for Presenter, for BC purposes
*
* @package Fuel
* @subpackage Core
* @category Core
- * @author Jelmer Schreuder
*/
-abstract class ViewModel
+abstract class Viewmodel extends Presenter
{
- /**
- * Factory for fetching the ViewModel
- *
- * @param string ViewModel classname without View_ prefix or full classname
- * @param string Method to execute
- * @return ViewModel
- */
- public static function forge($viewmodel, $method = 'view', $auto_filter = null, $view = null)
- {
- // if no custom view is given, make it equal to the viewmodel name
- is_null($view) and $view = $viewmodel;
-
- // strip any extensions from the view name to determine the viewmodel to load
- $viewmodel = \Inflector::words_to_upper(str_replace(
- array('/', DS),
- '_',
- strpos($viewmodel, '.') === false ? $viewmodel : substr($viewmodel, 0, -strlen(strrchr($viewmodel, '.')))
- ));
-
- // determine the viewmodel namespace from the current request context
- $namespace = \Request::active() ? ucfirst(\Request::active()->module) : '';
-
- // list of possible viewmodel classnames, start with the namespaced one
- $classes = array($namespace.'\\View_'.$viewmodel);
-
- // add the global version if needed
- empty($namespace) or $classes[] = 'View_'.$viewmodel;
-
- /**
- * Add non View_ prefixed classnames to the list, for BC reasons
- *
- * @deprecated 1.6
- */
- $classes[] = $namespace.'\\'.$viewmodel;
-
- // and add the global version of that if needed
- empty($namespace) or $classes[] = $viewmodel;
-
- // check if we can find one
- foreach ($classes as $class)
- {
- if (class_exists($class))
- {
- return new $class($method, $auto_filter, $view);
- }
- }
-
- throw new \OutOfBoundsException('ViewModel "'.reset($classes).'" could not be found.');
- }
-
- /**
- * @var string method to execute when rendering
- */
- protected $_method;
-
- /**
- * @var string|View view name, after instantiation a View object
- */
- protected $_view;
-
- /**
- * @var bool whether or not to use auto filtering
- */
- protected $_auto_filter;
-
- /**
- * @var Request active request during ViewModel creation for proper context
- */
- protected $_active_request;
-
- protected function __construct($method, $auto_filter = null, $view = null)
- {
- $this->_auto_filter = $auto_filter;
- $this->_view === null and $this->_view = $view;
- class_exists('Request', false) and $this->_active_request = \Request::active();
-
- if (empty($this->_view))
- {
- // Take the class name and guess the view name
- $class = get_class($this);
- $this->_view = strtolower(str_replace('_', DS, preg_replace('#^([a-z0-9_]*\\\\)?(View_)?#i', '', $class)));
- }
-
- $this->set_view();
-
- $this->_method = $method;
- }
-
- /**
- * Returns the View object associated with this Viewmodel
- *
- * @return View
- */
- public function get_view()
- {
- return $this->_view;
- }
-
- /**
- * Construct the View object
- */
- protected function set_view()
- {
- $this->_view instanceOf View or $this->_view = \View::forge($this->_view);
- }
-
- /**
- * Returns the active request object.
- *
- * @return Request
- */
- protected function request()
- {
- return $this->_active_request;
- }
-
- /**
- * Executed before the view method
- */
- public function before() {}
-
- /**
- * The default view method
- * Should set all expected variables upon itself
- */
- public function view() {}
-
- /**
- * Executed after the view method
- */
- public function after() {}
-
- /**
- * Fetches an existing value from the template
- *
- * @return mixed
- */
- public function & __get($name)
- {
- return $this->get($name);
- }
-
- /**
- * Gets a variable from the template
- *
- * @param string
- */
- public function & get($key = null, $default = null)
- {
- if (is_null($default) and func_num_args() === 1)
- {
- return $this->_view->get($key);
- }
- return $this->_view->get($key, $default);
- }
-
- /**
- * Sets and sanitizes a variable on the template
- *
- * @param string
- * @param mixed
- */
- public function __set($key, $value)
- {
- return $this->set($key, $value);
- }
-
- /**
- * Sets a variable on the template
- *
- * @param string
- * @param mixed
- * @param bool|null
- */
- public function set($key, $value = null, $filter = null)
- {
- is_null($filter) and $filter = $this->_auto_filter;
- $this->_view->set($key, $value, $filter);
-
- return $this;
- }
-
- /**
- * Magic method, determines if a variable is set.
- *
- * isset($view->foo);
- *
- * @param string variable name
- * @return boolean
- */
- public function __isset($key)
- {
- return isset($this->_view->$key);
- }
-
- /**
- * Assigns a value by reference. The benefit of binding is that values can
- * be altered without re-setting them. It is also possible to bind variables
- * before they have values. Assigned values will be available as a
- * variable within the view file:
- *
- * $this->bind('ref', $bar);
- *
- * @param string variable name
- * @param mixed referenced variable
- * @param bool Whether to filter the var on output
- * @return $this
- */
- public function bind($key, &$value, $filter = null)
- {
- $this->_view->bind($key, $value, $filter);
-
- return $this;
- }
-
- /**
- * Change auto filter setting
- *
- * @param null|bool change setting (bool) or get the current setting (null)
- * @return void|bool returns current setting or nothing when it is changed
- */
- public function auto_filter($setting = null)
- {
- if (func_num_args() == 0)
- {
- return $this->_view->auto_filter();
- }
-
- return $this->_view->auto_filter($setting);
- }
-
-
- /**
- * Add variables through method and after() and create template as a string
- */
- public function render()
- {
- if (class_exists('Request', false))
- {
- $current_request = Request::active();
- Request::active($this->_active_request);
- }
-
- $this->before();
- $this->{$this->_method}();
- $this->after();
-
- $return = $this->_view->render();
-
- if (class_exists('Request', false))
- {
- Request::active($current_request);
- }
-
- return $return;
- }
-
- /**
- * Auto-render on toString
- */
- public function __toString()
- {
- try
- {
- return $this->render();
- }
- catch (\Exception $e)
- {
- \Error::exception_handler($e);
-
- return '';
- }
- }
+ // namespace prefix
+ protected static $ns_prefix = 'View_';
}
-
-
diff --git a/config/agent.php b/config/agent.php
index 06c23d3a3d..cedfbe24ba 100644
--- a/config/agent.php
+++ b/config/agent.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -39,11 +39,9 @@
/**
* Location from where the updated browscap file can be downloaded.
- *
- * Note: these are temporary links awaiting relaunch of the browscap project
*/
- 'url' => 'http://tempdownloads.browserscap.com/stream.asp?Lite_PHP_BrowsCapINI', // only major browsers and search engines
- //'url' => 'http://tempdownloads.browserscap.com/stream.asp?Full_PHP_BrowscapINI', // complete file, approx. 3 times the lite version
+ 'url' => 'http://browscap.org/stream?q=Lite_PHP_BrowsCapINI', // only major browsers and search engines
+ //'url' => 'http://browscap.org/stream?q=Full_PHP_BrowsCapINI', // complete file, approx. 3 times the lite version
/**
* Method used to download the updated browscap file
diff --git a/config/ascii.php b/config/ascii.php
index bbf1b8d0b2..19c7d5c697 100644
--- a/config/ascii.php
+++ b/config/ascii.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/asset.php b/config/asset.php
index 9e699ead0b..ec60bad7b9 100644
--- a/config/asset.php
+++ b/config/asset.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -107,4 +107,12 @@
* The asset will then be skipped.
*/
'fail_silently' => false,
+
+ /**
+ * When set to true, the Asset class will always true to resolve an asset URI
+ * to a local asset, even if the asset URL is an absolute URL, for example
+ * one that points to another hostname.
+ */
+ 'always_resolve' => false,
+
);
diff --git a/config/cache.php b/config/cache.php
index d62693ac7b..7f345fd817 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -70,6 +70,11 @@
'redis' => array(
'database' => 'default' // name of the redis database to use (as configured in config/db.php)
),
+
+ // specific configuration settings for the xcache driver
+ 'xcache' => array(
+ 'cache_id' => 'fuel', // unique id to distinquish fuel cache items from others stored on the same server(s)
+ ),
);
diff --git a/config/config.php b/config/config.php
index 95da345c90..7354685734 100644
--- a/config/config.php
+++ b/config/config.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -128,9 +128,20 @@
* Fuel::L_ALL
*/
'log_threshold' => Fuel::L_WARNING,
+
+ /**
+ * Log file and path. If no filename is given, it will be generated.
+ */
+ 'log_file' => null,
'log_path' => APPPATH.'logs/',
+
'log_date_format' => 'Y-m-d H:i:s',
+ /**
+ * If true, a backtrace is printed when a PHP fatal error is encountered in CLI mode
+ */
+ 'cli_backtrace' => false,
+
/**
* Security settings
*/
diff --git a/config/date.php b/config/date.php
index 42e284e70d..7c37d21cab 100644
--- a/config/date.php
+++ b/config/date.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/db.php b/config/db.php
index 6d6a30e1e3..9855e187a2 100644
--- a/config/db.php
+++ b/config/db.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/doctypes.php b/config/doctypes.php
index f688a5bf08..0213768dfb 100644
--- a/config/doctypes.php
+++ b/config/doctypes.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/file.php b/config/file.php
index 69c79fc742..19be3de94e 100644
--- a/config/file.php
+++ b/config/file.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/form.php b/config/form.php
index 32345928ad..ae4c11d6b7 100644
--- a/config/form.php
+++ b/config/form.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/format.php b/config/format.php
index 729725ea3d..fb15fe7baf 100644
--- a/config/format.php
+++ b/config/format.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -25,15 +25,16 @@
'delimiter' => ',',
'enclosure' => '"',
'newline' => "\n",
- 'escape' => '"',
+ 'escape' => '\\',
),
'export' => array(
'delimiter' => ',',
'enclosure' => '"',
'newline' => "\n",
- 'escape' => '"',
+ 'escape' => '\\',
),
- 'regex_newline' => '\n',
+ 'regex_newline' => "\n",
+ 'enclose_numbers' => true,
),
'xml' => array(
'basenode' => 'xml',
diff --git a/config/ftp.php b/config/ftp.php
index 2b7bd19c7c..5be58ef347 100644
--- a/config/ftp.php
+++ b/config/ftp.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/image.php b/config/image.php
index b6db459fe3..302dabd7ed 100644
--- a/config/image.php
+++ b/config/image.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/migrations.php b/config/migrations.php
index 910be95dcc..60d7d800ef 100644
--- a/config/migrations.php
+++ b/config/migrations.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/num.php b/config/num.php
index 647bcec8b8..2a558816ac 100644
--- a/config/num.php
+++ b/config/num.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/package.php b/config/package.php
index 6d18f6485f..3d492f41f4 100644
--- a/config/package.php
+++ b/config/package.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/pagination.php b/config/pagination.php
index e11dd51aa8..b9cc83d86b 100644
--- a/config/pagination.php
+++ b/config/pagination.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/rest.php b/config/rest.php
index 79abb0fca3..a7e4b8b010 100644
--- a/config/rest.php
+++ b/config/rest.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/config/session.php b/config/session.php
index 1bb4e553e4..63466d52d6 100644
--- a/config/session.php
+++ b/config/session.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -72,11 +72,14 @@
'post_cookie_name' => '',
// for requests in which you don't want to use cookies, use an HTTP header by this name to pass the cookie to the session driver
- 'header_header_name' => 'Session-Id',
+ 'http_header_name' => 'Session-Id',
// if false, no cookie will be added to the response send back to the client
'enable_cookie' => true,
+ // if true, session data will be synced with PHP's native $_SESSION, to allow easier integration of third-party components
+ 'native_emulation' => false,
+
/**
* specific driver configurations. to override a global setting, just add it to the driver config with a different value
*/
diff --git a/config/test/agent.php b/config/test/agent.php
new file mode 100644
index 0000000000..0cddf24b29
--- /dev/null
+++ b/config/test/agent.php
@@ -0,0 +1,14 @@
+ array(
+ 'enabled' => true,
+ 'url' => '',
+ 'method' => 'local',
+ 'file' => __DIR__.DS.'..'.DS.'..'.DS.'tests'.DS.'agent'.DS.'browscap.ini',
+ ),
+ 'cache' => array(
+ 'driver' => '',
+ 'expiry' => 1,
+ 'identifier' => 'fuel.agent-test',
+ )
+);
\ No newline at end of file
diff --git a/config/theme.php b/config/theme.php
index be26d4773e..dad0534ea9 100644
--- a/config/theme.php
+++ b/config/theme.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -36,7 +36,7 @@
* on the fly via Theme::add_path($path) or Theme::add_paths(array($path1, $path2));
*/
'paths' => array(
- DOCROOT.'themes',
+ APPPATH.'themes',
),
/**
diff --git a/config/upload.php b/config/upload.php
index 4c3bb26178..4660a67bf9 100644
--- a/config/upload.php
+++ b/config/upload.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/lang/en/test.php b/lang/en/test.php
index bc15cb73f9..184fd0101f 100644
--- a/lang/en/test.php
+++ b/lang/en/test.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/phpunit.xml b/phpunit.xml
index 173c1470d6..e5a8341e63 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -19,5 +19,8 @@
COREPATH/tests/debug.php @ line: 31
Variable #1:'."\n".' (Integer): 1'."\n\n\n".'Variable #2:'."\n".' (Integer): 2'."\n\n\n".'Variable #3:'."\n".' (Integer): 3'."\n\n\n".'
COREPATH/tests/debug.php @ line: 41
Variable #1:'."\n".' (Integer): 1'."\n\n\n".'Variable #2:'."\n".' (Integer): 2'."\n\n\n".'Variable #3:'."\n".' (Integer): 3'."\n\n\n".'
COREPATH/tests/debug.php @ line: 46
Variable #1:'."\n".' (Integer): 1'."\n\n\n".'Variable #2:'."\n".' (Integer): 2'."\n\n\n".'Variable #3:'."\n".' (Integer): 3'."\n\n\n".'
COREPATH/tests/debug.php @ line: 53
Variable #1:'."\n".' (Integer): 1'."\n\n\n".'Variable #2:'."\n".' (Integer): 2'."\n\n\n".'Variable #3:'."\n".' (Integer): 3'."\n\n\n".'
COREPATH/base.php @ line: 491
Variable #1:
+ (Integer): 1
+
+
+Variable #2:
+ (Integer): 2
+
+
+Variable #3:
+ (Integer): 3
+
- $expected = '
COREPATH/base.php @ line: 468
Variable #1:'."\n".' (Integer): 1'."\n\n\n".'Variable #2:'."\n".' (Integer): 2'."\n\n\n".'Variable #3:'."\n".' (Integer): 3'."\n\n\n".'
Lorem ipsum dol...
';
- $this->assertEquals($expected, $output);
}
/**
diff --git a/tests/testcase.php b/tests/testcase.php
index 776ebe2607..8cf3074c07 100644
--- a/tests/testcase.php
+++ b/tests/testcase.php
@@ -3,10 +3,10 @@
* Part of the Fuel framework.
*
* @package Fuel
- * @version 1.6
+ * @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/tests/unzip.php b/tests/unzip.php
index f1140ee8ef..8d6788adc7 100644
--- a/tests/unzip.php
+++ b/tests/unzip.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/tests/upload.php b/tests/upload.php
index 0ede2f1bd9..266a299ded 100644
--- a/tests/upload.php
+++ b/tests/upload.php
@@ -3,10 +3,10 @@
* Part of the Fuel framework.
*
* @package Fuel
- * @version 1.6
+ * @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/tests/uri.php b/tests/uri.php
index 9cf7dc966d..8362e82162 100644
--- a/tests/uri.php
+++ b/tests/uri.php
@@ -3,10 +3,10 @@
* Part of the Fuel framework.
*
* @package Fuel
- * @version 1.6
+ * @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
@@ -20,6 +20,19 @@
*/
class Test_Uri extends TestCase
{
+ public function setUp()
+ {
+ $this->old_url_suffix = Config::get('url_suffix');
+ $this->old_index_file = Config::get('index_file');
+ $this->old_base_url = Config::get('base_url');
+ }
+
+ public function tearDown()
+ {
+ Config::set('url_suffix', $this->old_url_suffix);
+ Config::set('index_file', $this->old_index_file);
+ Config::set('base_url', $this->old_base_url);
+ }
/**
* Tests Uri::create()
diff --git a/tests/validation.php b/tests/validation.php
index 33256f4714..bc8827390c 100644
--- a/tests/validation.php
+++ b/tests/validation.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/tests/validation/error.php b/tests/validation/error.php
index 5476a1ec38..d86ea335dc 100644
--- a/tests/validation/error.php
+++ b/tests/validation/error.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/tests/view.php b/tests/view.php
index 1b91d0a597..19c7b1a1c9 100644
--- a/tests/view.php
+++ b/tests/view.php
@@ -6,7 +6,7 @@
* @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/tests/view/exception.php b/tests/view/exception.php
index 0c36d6595b..df24a58a0d 100644
--- a/tests/view/exception.php
+++ b/tests/view/exception.php
@@ -3,10 +3,10 @@
* Part of the Fuel framework.
*
* @package Fuel
- * @version 1.6
+ * @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/tests/viewmodel.php b/tests/viewmodel.php
index 2766197162..b33c4a5518 100644
--- a/tests/viewmodel.php
+++ b/tests/viewmodel.php
@@ -3,10 +3,10 @@
* Part of the Fuel framework.
*
* @package Fuel
- * @version 1.6
+ * @version 1.7
* @author Fuel Development Team
* @license MIT License
- * @copyright 2010 - 2013 Fuel Development Team
+ * @copyright 2010 - 2014 Fuel Development Team
* @link http://fuelphp.com
*/
diff --git a/vendor/markdown/License.text b/vendor/markdown/License.text
deleted file mode 100644
index 4d6bf8b635..0000000000
--- a/vendor/markdown/License.text
+++ /dev/null
@@ -1,36 +0,0 @@
-PHP Markdown & Extra
-Copyright (c) 2004-2009 Michel Fortin
-
", $text); - } - return $text; - } - - function mdwp_strip_p($t) { return preg_replace('{?p>}i', '', $t); } - - function mdwp_hide_tags($text) { - global $mdwp_hidden_tags, $mdwp_placeholders; - return str_replace($mdwp_hidden_tags, $mdwp_placeholders, $text); - } - function mdwp_show_tags($text) { - global $mdwp_hidden_tags, $mdwp_placeholders; - return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text); - } -} - - -### bBlog Plugin Info ### - -function identify_modifier_markdown() { - return array( - 'name' => 'markdown', - 'type' => 'modifier', - 'nicename' => 'PHP Markdown Extra', - 'description' => 'A text-to-HTML conversion tool for web writers', - 'authors' => 'Michel Fortin and John Gruber', - 'licence' => 'GPL', - 'version' => MARKDOWNEXTRA_VERSION, - 'help' => 'Markdown syntax allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by John Gruber. More...', - ); -} - - -### Smarty Modifier Interface ### - -function smarty_modifier_markdown($text) { - return Markdown($text); -} - - -### Textile Compatibility Mode ### - -# Rename this file to "classTextile.php" and it can replace Textile everywhere. - -if (strcasecmp(substr(__FILE__, -16), "classTextile.php") == 0) { - # Try to include PHP SmartyPants. Should be in the same directory. - @include_once 'smartypants.php'; - # Fake Textile class. It calls Markdown instead. - class Textile { - function TextileThis($text, $lite='', $encode='') { - if ($lite == '' && $encode == '') $text = Markdown($text); - if (function_exists('SmartyPants')) $text = SmartyPants($text); - return $text; - } - # Fake restricted version: restrictions are not supported for now. - function TextileRestricted($text, $lite='', $noimage='') { - return $this->TextileThis($text, $lite); - } - # Workaround to ensure compatibility with TextPattern 4.0.3. - function blockLite($text) { return $text; } - } -} - - - -# -# Markdown Parser Class -# - -class Markdown_Parser { - - ### Configuration Variables ### - - # Change to ">" for HTML output. - var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX; - var $tab_width = MARKDOWN_TAB_WIDTH; - - # Change to `true` to disallow markup or entities. - var $no_markup = false; - var $no_entities = false; - - # Predefined urls and titles for reference links and images. - var $predef_urls = array(); - var $predef_titles = array(); - - - ### Parser Implementation ### - - # Regex to match balanced [brackets]. - # Needed to insert a maximum bracked depth while converting to PHP. - var $nested_brackets_depth = 6; - var $nested_brackets_re; - - var $nested_url_parenthesis_depth = 4; - var $nested_url_parenthesis_re; - - # Table of hash values for escaped characters: - var $escape_chars = '\`*_{}[]()>#+-.!'; - var $escape_chars_re; - - - function Markdown_Parser() { - # - # Constructor function. Initialize appropriate member variables. - # - $this->_initDetab(); - $this->prepareItalicsAndBold(); - - $this->nested_brackets_re = - str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth). - str_repeat('\])*', $this->nested_brackets_depth); - - $this->nested_url_parenthesis_re = - str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth). - str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth); - - $this->escape_chars_re = '['.preg_quote($this->escape_chars).']'; - - # Sort document, block, and span gamut in ascendent priority order. - asort($this->document_gamut); - asort($this->block_gamut); - asort($this->span_gamut); - } - - - # Internal hashes used during transformation. - var $urls = array(); - var $titles = array(); - var $html_hashes = array(); - - # Status flag to avoid invalid nesting. - var $in_anchor = false; - - - function setup() { - # - # Called before the transformation process starts to setup parser - # states. - # - # Clear global hashes. - $this->urls = $this->predef_urls; - $this->titles = $this->predef_titles; - $this->html_hashes = array(); - - $in_anchor = false; - } - - function teardown() { - # - # Called after the transformation process to clear any variable - # which may be taking up memory unnecessarly. - # - $this->urls = array(); - $this->titles = array(); - $this->html_hashes = array(); - } - - - function transform($text) { - # - # Main function. Performs some preprocessing on the input text - # and pass it through the document gamut. - # - $this->setup(); - - # Remove UTF-8 BOM and marker character in input, if present. - $text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text); - - # Standardize line endings: - # DOS to Unix and Mac to Unix - $text = preg_replace('{\r\n?}', "\n", $text); - - # Make sure $text ends with a couple of newlines: - $text .= "\n\n"; - - # Convert all tabs to spaces. - $text = $this->detab($text); - - # Turn block-level HTML blocks into hash entries - $text = $this->hashHTMLBlocks($text); - - # Strip any lines consisting only of spaces and tabs. - # This makes subsequent regexen easier to write, because we can - # match consecutive blank lines with /\n+/ instead of something - # contorted like /[ ]*\n+/ . - $text = preg_replace('/^[ ]+$/m', '', $text); - - # Run document gamut methods. - foreach ($this->document_gamut as $method => $priority) { - $text = $this->$method($text); - } - - $this->teardown(); - - return $text . "\n"; - } - - var $document_gamut = array( - # Strip link definitions, store in hashes. - "stripLinkDefinitions" => 20, - - "runBasicBlockGamut" => 30, - ); - - - function stripLinkDefinitions($text) { - # - # Strips link definitions from text, stores the URLs and titles in - # hash references. - # - $less_than_tab = $this->tab_width - 1; - - # Link defs are in the form: ^[id]: url "optional title" - $text = preg_replace_callback('{ - ^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?: # id = $1 - [ ]* - \n? # maybe *one* newline - [ ]* - (?: - <(.+?)> # url = $2 - | - (\S+?) # url = $3 - ) - [ ]* - \n? # maybe one newline - [ ]* - (?: - (?<=\s) # lookbehind for whitespace - ["(] - (.*?) # title = $4 - [")] - [ ]* - )? # title is optional - (?:\n+|\Z) - }xm', - array(&$this, '_stripLinkDefinitions_callback'), - $text); - return $text; - } - function _stripLinkDefinitions_callback($matches) { - $link_id = strtolower($matches[1]); - $url = $matches[2] == '' ? $matches[3] : $matches[2]; - $this->urls[$link_id] = $url; - $this->titles[$link_id] =& $matches[4]; - return ''; # String that will replace the block - } - - - function hashHTMLBlocks($text) { - if ($this->no_markup) return $text; - - $less_than_tab = $this->tab_width - 1; - - # Hashify HTML blocks: - # We only want to do this for block-level HTML tags, such as headers, - # lists, and tables. That's because we still want to wrap
s around - # "paragraphs" that are wrapped in non-block-level tags, such as anchors, - # phrase emphasis, and spans. The list of tags we're looking for is - # hard-coded: - # - # * List "a" is made of tags which can be both inline or block-level. - # These will be treated block-level when the start tag is alone on - # its line, otherwise they're not matched here and will be taken as - # inline later. - # * List "b" is made of tags which are always block-level; - # - $block_tags_a_re = 'ins|del'; - $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'. - 'script|noscript|form|fieldset|iframe|math|svg|'. - 'article|section|nav|aside|hgroup|header|footer|'. - 'figure'; - - # Regular expression for the content of a block tag. - $nested_tags_level = 4; - $attr = ' - (?> # optional tag attributes - \s # starts with whitespace - (?> - [^>"/]+ # text outside quotes - | - /+(?!>) # slash not followed by ">" - | - "[^"]*" # text inside double quotes (tolerate ">") - | - \'[^\']*\' # text inside single quotes (tolerate ">") - )* - )? - '; - $content = - str_repeat(' - (?> - [^<]+ # content without tag - | - <\2 # nested opening tag - '.$attr.' # attributes - (?> - /> - | - >', $nested_tags_level). # end of opening tag - '.*?'. # last level nested tag content - str_repeat(' - \2\s*> # closing nested tag - ) - | - <(?!/\2\s*> # other tags with a different name - ) - )*', - $nested_tags_level); - $content2 = str_replace('\2', '\3', $content); - - # First, look for nested blocks, e.g.: - #
` blocks.
- #
- $text = preg_replace_callback('{
- (?:\n\n|\A\n?)
- ( # $1 = the code block -- one or more lines, starting with a space/tab
- (?>
- [ ]{'.$this->tab_width.'} # Lines must start with a tab or a tab-width of spaces
- .*\n+
- )+
- )
- ((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z) # Lookahead for non-space at line-start, or end of doc
- }xm',
- array(&$this, '_doCodeBlocks_callback'), $text);
-
- return $text;
- }
- function _doCodeBlocks_callback($matches) {
- $codeblock = $matches[1];
-
- $codeblock = $this->outdent($codeblock);
- $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-
- # trim leading newlines and trailing newlines
- $codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
-
- $codeblock = "$codeblock\n
";
- return "\n\n".$this->hashBlock($codeblock)."\n\n";
- }
-
-
- function makeCodeSpan($code) {
- #
- # Create a code span markup for $code. Called from handleSpanToken.
- #
- $code = htmlspecialchars(trim($code), ENT_NOQUOTES);
- return $this->hashPart("$code
");
- }
-
-
- var $em_relist = array(
- '' => '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(?em_relist as $em => $em_re) {
- foreach ($this->strong_relist as $strong => $strong_re) {
- # Construct list of allowed token expressions.
- $token_relist = array();
- if (isset($this->em_strong_relist["$em$strong"])) {
- $token_relist[] = $this->em_strong_relist["$em$strong"];
- }
- $token_relist[] = $em_re;
- $token_relist[] = $strong_re;
-
- # Construct master expression from list.
- $token_re = '{('. implode('|', $token_relist) .')}';
- $this->em_strong_prepared_relist["$em$strong"] = $token_re;
- }
- }
- }
-
- function doItalicsAndBold($text) {
- $token_stack = array('');
- $text_stack = array('');
- $em = '';
- $strong = '';
- $tree_char_em = false;
-
- while (1) {
- #
- # Get prepared regular expression for seraching emphasis tokens
- # in current context.
- #
- $token_re = $this->em_strong_prepared_relist["$em$strong"];
-
- #
- # Each loop iteration search for the next emphasis token.
- # Each token is then passed to handleSpanToken.
- #
- $parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
- $text_stack[0] .= $parts[0];
- $token =& $parts[1];
- $text =& $parts[2];
-
- if (empty($token)) {
- # Reached end of text span: empty stack without emitting.
- # any more emphasis.
- while ($token_stack[0]) {
- $text_stack[1] .= array_shift($token_stack);
- $text_stack[0] .= array_shift($text_stack);
- }
- break;
- }
-
- $token_len = strlen($token);
- if ($tree_char_em) {
- # Reached closing marker while inside a three-char emphasis.
- if ($token_len == 3) {
- # Three-char closing marker, close em and strong.
- array_shift($token_stack);
- $span = array_shift($text_stack);
- $span = $this->runSpanGamut($span);
- $span = "$span";
- $text_stack[0] .= $this->hashPart($span);
- $em = '';
- $strong = '';
- } else {
- # Other closing marker: close one em or strong and
- # change current token state to match the other
- $token_stack[0] = str_repeat($token{0}, 3-$token_len);
- $tag = $token_len == 2 ? "strong" : "em";
- $span = $text_stack[0];
- $span = $this->runSpanGamut($span);
- $span = "<$tag>$span$tag>";
- $text_stack[0] = $this->hashPart($span);
- $$tag = ''; # $$tag stands for $em or $strong
- }
- $tree_char_em = false;
- } else if ($token_len == 3) {
- if ($em) {
- # Reached closing marker for both em and strong.
- # Closing strong marker:
- for ($i = 0; $i < 2; ++$i) {
- $shifted_token = array_shift($token_stack);
- $tag = strlen($shifted_token) == 2 ? "strong" : "em";
- $span = array_shift($text_stack);
- $span = $this->runSpanGamut($span);
- $span = "<$tag>$span$tag>";
- $text_stack[0] .= $this->hashPart($span);
- $$tag = ''; # $$tag stands for $em or $strong
- }
- } else {
- # Reached opening three-char emphasis marker. Push on token
- # stack; will be handled by the special condition above.
- $em = $token{0};
- $strong = "$em$em";
- array_unshift($token_stack, $token);
- array_unshift($text_stack, '');
- $tree_char_em = true;
- }
- } else if ($token_len == 2) {
- if ($strong) {
- # Unwind any dangling emphasis marker:
- if (strlen($token_stack[0]) == 1) {
- $text_stack[1] .= array_shift($token_stack);
- $text_stack[0] .= array_shift($text_stack);
- }
- # Closing strong marker:
- array_shift($token_stack);
- $span = array_shift($text_stack);
- $span = $this->runSpanGamut($span);
- $span = "$span";
- $text_stack[0] .= $this->hashPart($span);
- $strong = '';
- } else {
- array_unshift($token_stack, $token);
- array_unshift($text_stack, '');
- $strong = $token;
- }
- } else {
- # Here $token_len == 1
- if ($em) {
- if (strlen($token_stack[0]) == 1) {
- # Closing emphasis marker:
- array_shift($token_stack);
- $span = array_shift($text_stack);
- $span = $this->runSpanGamut($span);
- $span = "$span";
- $text_stack[0] .= $this->hashPart($span);
- $em = '';
- } else {
- $text_stack[0] .= $token;
- }
- } else {
- array_unshift($token_stack, $token);
- array_unshift($text_stack, '');
- $em = $token;
- }
- }
- }
- return $text_stack[0];
- }
-
-
- function doBlockQuotes($text) {
- $text = preg_replace_callback('/
- ( # Wrap whole match in $1
- (?>
- ^[ ]*>[ ]? # ">" at the start of a line
- .+\n # rest of the first line
- (.+\n)* # subsequent consecutive lines
- \n* # blanks
- )+
- )
- /xm',
- array(&$this, '_doBlockQuotes_callback'), $text);
-
- return $text;
- }
- function _doBlockQuotes_callback($matches) {
- $bq = $matches[1];
- # trim one level of quoting - trim whitespace-only lines
- $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
- $bq = $this->runBlockGamut($bq); # recurse
-
- $bq = preg_replace('/^/m', " ", $bq);
- # These leading spaces cause problem with content,
- # so we need to fix that:
- $bq = preg_replace_callback('{(\s*.+?
)}sx',
- array(&$this, '_doBlockQuotes_callback2'), $bq);
-
- return "\n". $this->hashBlock("\n$bq\n
")."\n\n";
- }
- function _doBlockQuotes_callback2($matches) {
- $pre = $matches[1];
- $pre = preg_replace('/^ /m', '', $pre);
- return $pre;
- }
-
-
- function formParagraphs($text) {
- #
- # Params:
- # $text - string to process with html tags
- #
- # Strip leading and trailing lines:
- $text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
- $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
- #
- # Wrap
tags and unhashify HTML blocks
- #
- foreach ($grafs as $key => $value) {
- if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
- # Is a paragraph.
- $value = $this->runSpanGamut($value);
- $value = preg_replace('/^([ ]*)/', "
", $value);
- $value .= "
";
- $grafs[$key] = $this->unhash($value);
- }
- else {
- # Is a block.
- # Modify elements of @grafs in-place...
- $graf = $value;
- $block = $this->html_hashes[$graf];
- $graf = $block;
-// if (preg_match('{
-// \A
-// ( # $1 = tag
-// ]*
-// \b
-// markdown\s*=\s* ([\'"]) # $2 = attr quote char
-// 1
-// \2
-// [^>]*
-// >
-// )
-// ( # $3 = contents
-// .*
-// )
-// () # $4 = closing tag
-// \z
-// }xs', $block, $matches))
-// {
-// list(, $div_open, , $div_content, $div_close) = $matches;
-//
-// # We can't call Markdown(), because that resets the hash;
-// # that initialization code should be pulled into its own sub, though.
-// $div_content = $this->hashHTMLBlocks($div_content);
-//
-// # Run document gamut methods on the content.
-// foreach ($this->document_gamut as $method => $priority) {
-// $div_content = $this->$method($div_content);
-// }
-//
-// $div_open = preg_replace(
-// '{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
-//
-// $graf = $div_open . "\n" . $div_content . "\n" . $div_close;
-// }
- $grafs[$key] = $graf;
- }
- }
-
- return implode("\n\n", $grafs);
- }
-
-
- function encodeAttribute($text) {
- #
- # Encode text for a double-quoted HTML attribute. This function
- # is *not* suitable for attributes enclosed in single quotes.
- #
- $text = $this->encodeAmpsAndAngles($text);
- $text = str_replace('"', '"', $text);
- return $text;
- }
-
-
- function encodeAmpsAndAngles($text) {
- #
- # Smart processing for ampersands and angle brackets that need to
- # be encoded. Valid character entities are left alone unless the
- # no-entities mode is set.
- #
- if ($this->no_entities) {
- $text = str_replace('&', '&', $text);
- } else {
- # Ampersand-encoding based entirely on Nat Irons's Amputator
- # MT plugin:
- $text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
- '&', $text);;
- }
- # Encode remaining <'s
- $text = str_replace('<', '<', $text);
-
- return $text;
- }
-
-
- function doAutoLinks($text) {
- $text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i',
- array(&$this, '_doAutoLinks_url_callback'), $text);
-
- # Email addresses:
- $text = preg_replace_callback('{
- <
- (?:mailto:)?
- (
- (?:
- [-!#$%&\'*+/=?^_`.{|}~\w\x80-\xFF]+
- |
- ".*?"
- )
- \@
- (?:
- [-a-z0-9\x80-\xFF]+(\.[-a-z0-9\x80-\xFF]+)*\.[a-z]+
- |
- \[[\d.a-fA-F:]+\] # IPv4 & IPv6
- )
- )
- >
- }xi',
- array(&$this, '_doAutoLinks_email_callback'), $text);
-
- return $text;
- }
- function _doAutoLinks_url_callback($matches) {
- $url = $this->encodeAttribute($matches[1]);
- $link = "$url";
- return $this->hashPart($link);
- }
- function _doAutoLinks_email_callback($matches) {
- $address = $matches[1];
- $link = $this->encodeEmailAddress($address);
- return $this->hashPart($link);
- }
-
-
- function encodeEmailAddress($addr) {
- #
- # Input: an email address, e.g. "foo@example.com"
- #
- # Output: the email address as a mailto link, with each character
- # of the address encoded as either a decimal or hex entity, in
- # the hopes of foiling most address harvesting spam bots. E.g.:
- #
- #
- #
- # Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
- # With some optimizations by Milian Wolff.
- #
- $addr = "mailto:" . $addr;
- $chars = preg_split('/(? $char) {
- $ord = ord($char);
- # Ignore non-ascii chars.
- if ($ord < 128) {
- $r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
- # roughly 10% raw, 45% hex, 45% dec
- # '@' *must* be encoded. I insist.
- if ($r > 90 && $char != '@') /* do nothing */;
- else if ($r < 45) $chars[$key] = ''.dechex($ord).';';
- else $chars[$key] = ''.$ord.';';
- }
- }
-
- $addr = implode('', $chars);
- $text = implode('', array_slice($chars, 7)); # text without `mailto:`
- $addr = "$text";
-
- return $addr;
- }
-
-
- function parseSpan($str) {
- #
- # Take the string $str and parse it into tokens, hashing embeded HTML,
- # escaped characters and handling code spans.
- #
- $output = '';
-
- $span_re = '{
- (
- \\\\'.$this->escape_chars_re.'
- |
- (?no_markup ? '' : '
- |
- # comment
- |
- <\?.*?\?> | <%.*?%> # processing instruction
- |
- <[!$]?[-a-zA-Z0-9:_]+ # regular tags
- (?>
- \s
- (?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
- )?
- >
- |
- <[-a-zA-Z0-9:_]+\s*/> # xml-style empty tag
- |
- [-a-zA-Z0-9:_]+\s*> # closing tag
- ').'
- )
- }xs';
-
- while (1) {
- #
- # Each loop iteration seach for either the next tag, the next
- # openning code span marker, or the next escaped character.
- # Each token is then passed to handleSpanToken.
- #
- $parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
-
- # Create token from text preceding tag.
- if ($parts[0] != "") {
- $output .= $parts[0];
- }
-
- # Check if we reach the end.
- if (isset($parts[1])) {
- $output .= $this->handleSpanToken($parts[1], $parts[2]);
- $str = $parts[2];
- }
- else {
- break;
- }
- }
-
- return $output;
- }
-
-
- function handleSpanToken($token, &$str) {
- #
- # Handle $token provided by parseSpan by determining its nature and
- # returning the corresponding value that should replace it.
- #
- switch ($token{0}) {
- case "\\":
- return $this->hashPart("". ord($token{1}). ";");
- case "`":
- # Search for end marker in remaining text.
- if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
- $str, $matches))
- {
- $str = $matches[2];
- $codespan = $this->makeCodeSpan($matches[1]);
- return $this->hashPart($codespan);
- }
- return $token; // return as text since no ending marker found.
- default:
- return $this->hashPart($token);
- }
- }
-
-
- function outdent($text) {
- #
- # Remove one level of line-leading tabs or spaces
- #
- return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
- }
-
-
- # String length function for detab. `_initDetab` will create a function to
- # hanlde UTF-8 if the default function does not exist.
- var $utf8_strlen = 'mb_strlen';
-
- function detab($text) {
- #
- # Replace tabs with the appropriate amount of space.
- #
- # For each line we separate the line in blocks delemited by
- # tab characters. Then we reconstruct every line by adding the
- # appropriate number of space between each blocks.
-
- $text = preg_replace_callback('/^.*\t.*$/m',
- array(&$this, '_detab_callback'), $text);
-
- return $text;
- }
- function _detab_callback($matches) {
- $line = $matches[0];
- $strlen = $this->utf8_strlen; # strlen function for UTF-8.
-
- # Split in blocks.
- $blocks = explode("\t", $line);
- # Add each blocks to the line.
- $line = $blocks[0];
- unset($blocks[0]); # Do not add first block twice.
- foreach ($blocks as $block) {
- # Calculate amount of space, insert spaces, insert block.
- $amount = $this->tab_width -
- $strlen($line, 'UTF-8') % $this->tab_width;
- $line .= str_repeat(" ", $amount) . $block;
- }
- return $line;
- }
- function _initDetab() {
- #
- # Check for the availability of the function in the `utf8_strlen` property
- # (initially `mb_strlen`). If the function is not available, create a
- # function that will loosely count the number of UTF-8 characters with a
- # regular expression.
- #
- if (function_exists($this->utf8_strlen)) return;
- $this->utf8_strlen = create_function('$text', 'return preg_match_all(
- "/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
- $text, $m);');
- }
-
-
- function unhash($text) {
- #
- # Swap back in all the tags hashed by _HashHTMLBlocks.
- #
- return preg_replace_callback('/(.)\x1A[0-9]+\1/',
- array(&$this, '_unhash_callback'), $text);
- }
- function _unhash_callback($matches) {
- return $this->html_hashes[$matches[0]];
- }
-
-}
-
-
-#
-# Markdown Extra Parser Class
-#
-
-class MarkdownExtra_Parser extends Markdown_Parser {
-
- ### Configuration Variables ###
-
- # Prefix for footnote ids.
- var $fn_id_prefix = "";
-
- # Optional title attribute for footnote links and backlinks.
- var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
- var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
-
- # Optional class attribute for footnote links and backlinks.
- var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
- var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
-
- # Optional class prefix for fenced code block.
- var $code_class_prefix = MARKDOWN_CODE_CLASS_PREFIX;
- # Class attribute for code blocks goes on the `code` tag;
- # setting this to true will put attributes on the `pre` tag instead.
- var $code_attr_on_pre = MARKDOWN_CODE_ATTR_ON_PRE;
-
- # Predefined abbreviations.
- var $predef_abbr = array();
-
-
- ### Parser Implementation ###
-
- function MarkdownExtra_Parser() {
- #
- # Constructor function. Initialize the parser object.
- #
- # Add extra escapable characters before parent constructor
- # initialize the table.
- $this->escape_chars .= ':|';
-
- # Insert extra document, block, and span transformations.
- # Parent constructor will do the sorting.
- $this->document_gamut += array(
- "doFencedCodeBlocks" => 5,
- "stripFootnotes" => 15,
- "stripAbbreviations" => 25,
- "appendFootnotes" => 50,
- );
- $this->block_gamut += array(
- "doFencedCodeBlocks" => 5,
- "doTables" => 15,
- "doDefLists" => 45,
- );
- $this->span_gamut += array(
- "doFootnotes" => 5,
- "doAbbreviations" => 70,
- );
-
- parent::Markdown_Parser();
- }
-
-
- # Extra variables used during extra transformations.
- var $footnotes = array();
- var $footnotes_ordered = array();
- var $footnotes_ref_count = array();
- var $footnotes_numbers = array();
- var $abbr_desciptions = array();
- var $abbr_word_re = '';
-
- # Give the current footnote number.
- var $footnote_counter = 1;
-
-
- function setup() {
- #
- # Setting up Extra-specific variables.
- #
- parent::setup();
-
- $this->footnotes = array();
- $this->footnotes_ordered = array();
- $this->footnotes_ref_count = array();
- $this->footnotes_numbers = array();
- $this->abbr_desciptions = array();
- $this->abbr_word_re = '';
- $this->footnote_counter = 1;
-
- foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
- if ($this->abbr_word_re)
- $this->abbr_word_re .= '|';
- $this->abbr_word_re .= preg_quote($abbr_word);
- $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
- }
- }
-
- function teardown() {
- #
- # Clearing Extra-specific variables.
- #
- $this->footnotes = array();
- $this->footnotes_ordered = array();
- $this->footnotes_ref_count = array();
- $this->footnotes_numbers = array();
- $this->abbr_desciptions = array();
- $this->abbr_word_re = '';
-
- parent::teardown();
- }
-
-
- ### Extra Attribute Parser ###
-
- # Expression to use to catch attributes (includes the braces)
- var $id_class_attr_catch_re = '\{((?:[ ]*[#.][-_:a-zA-Z0-9]+){1,})[ ]*\}';
- # Expression to use when parsing in a context when no capture is desired
- var $id_class_attr_nocatch_re = '\{(?:[ ]*[#.][-_:a-zA-Z0-9]+){1,}[ ]*\}';
-
- function doExtraAttributes($tag_name, $attr) {
- #
- # Parse attributes caught by the $this->id_class_attr_catch_re expression
- # and return the HTML-formatted list of attributes.
- #
- # Currently supported attributes are .class and #id.
- #
- if (empty($attr)) return "";
-
- # Split on components
- preg_match_all("/[.#][-_:a-zA-Z0-9]+/", $attr, $matches);
- $elements = $matches[0];
-
- # handle classes and ids (only first id taken into account)
- $classes = array();
- $id = false;
- foreach ($elements as $element) {
- if ($element{0} == '.') {
- $classes[] = substr($element, 1);
- } else if ($element{0} == '#') {
- if ($id === false) $id = substr($element, 1);
- }
- }
-
- # compose attributes as string
- $attr_str = "";
- if (!empty($id)) {
- $attr_str .= ' id="'.$id.'"';
- }
- if (!empty($classes)) {
- $attr_str .= ' class="'.implode(" ", $classes).'"';
- }
- return $attr_str;
- }
-
-
- ### HTML Block Parser ###
-
- # Tags that are always treated as block tags:
- var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption';
-
- # Tags treated as block tags only if the opening tag is alone on its line:
- var $context_block_tags_re = 'script|noscript|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video';
-
- # Tags where markdown="1" default to span mode:
- var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
-
- # Tags which must not have their contents modified, no matter where
- # they appear:
- var $clean_tags_re = 'script|math|svg';
-
- # Tags that do not need to be closed.
- var $auto_close_tags_re = 'hr|img|param|source|track';
-
-
- function hashHTMLBlocks($text) {
- #
- # Hashify HTML Blocks and "clean tags".
- #
- # We only want to do this for block-level HTML tags, such as headers,
- # lists, and tables. That's because we still want to wrap s around
- # "paragraphs" that are wrapped in non-block-level tags, such as anchors,
- # phrase emphasis, and spans. The list of tags we're looking for is
- # hard-coded.
- #
- # This works by calling _HashHTMLBlocks_InMarkdown, which then calls
- # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1"
- # attribute is found within a tag, _HashHTMLBlocks_InHTML calls back
- # _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
- # These two functions are calling each other. It's recursive!
- #
- if ($this->no_markup) return $text;
-
- #
- # Call the HTML-in-Markdown hasher.
- #
- list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
-
- return $text;
- }
- function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
- $enclosing_tag_re = '', $span = false)
- {
- #
- # Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
- #
- # * $indent is the number of space to be ignored when checking for code
- # blocks. This is important because if we don't take the indent into
- # account, something like this (which looks right) won't work as expected:
- #
- #
- #
- # Hello World. <-- Is this a Markdown code block or text?
- # <-- Is this a Markdown code block or a real tag?
- #
- #
- # If you don't like this, just don't indent the tag on which
- # you apply the markdown="1" attribute.
- #
- # * If $enclosing_tag_re is not empty, stops at the first unmatched closing
- # tag with that name. Nested tags supported.
- #
- # * If $span is true, text inside must treated as span. So any double
- # newline will be replaced by a single newline so that it does not create
- # paragraphs.
- #
- # Returns an array of that form: ( processed text , remaining text )
- #
- if ($text === '') return array('', '');
-
- # Regex to check for the presense of newlines around a block tag.
- $newline_before_re = '/(?:^\n?|\n\n)*$/';
- $newline_after_re =
- '{
- ^ # Start of text following the tag.
- (?>[ ]*)? # Optional comment.
- [ ]*\n # Must be followed by newline.
- }xs';
-
- # Regex to match any tag.
- $block_tag_re =
- '{
- ( # $2: Capture whole tag.
- ? # Any opening or closing tag.
- (?> # Tag name.
- '.$this->block_tags_re.' |
- '.$this->context_block_tags_re.' |
- '.$this->clean_tags_re.' |
- (?!\s)'.$enclosing_tag_re.'
- )
- (?:
- (?=[\s"\'/a-zA-Z0-9]) # Allowed characters after tag name.
- (?>
- ".*?" | # Double quotes (can contain `>`)
- \'.*?\' | # Single quotes (can contain `>`)
- .+? # Anything but quotes and `>`.
- )*?
- )?
- > # End of tag.
- |
- # HTML Comment
- |
- <\?.*?\?> | <%.*?%> # Processing instruction
- |
- # CData Block
- |
- # Code span marker
- `+
- '. ( !$span ? ' # If not in span.
- |
- # Indented code block
- (?: ^[ ]*\n | ^ | \n[ ]*\n )
- [ ]{'.($indent+4).'}[^\n]* \n
- (?>
- (?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
- )*
- |
- # Fenced code block marker
- (?<= ^ | \n )
- [ ]{0,'.($indent+3).'}~{3,}
- [ ]*
- (?:
- [.]?[-_:a-zA-Z0-9]+ # standalone class name
- |
- '.$this->id_class_attr_nocatch_re.' # extra attributes
- )?
- [ ]*
- \n
- ' : '' ). ' # End (if not is span).
- )
- }xs';
-
-
- $depth = 0; # Current depth inside the tag tree.
- $parsed = ""; # Parsed text that will be returned.
-
- #
- # Loop through every tag until we find the closing tag of the parent
- # or loop until reaching the end of text if no parent tag specified.
- #
- do {
- #
- # Split the text using the first $tag_match pattern found.
- # Text before pattern will be first in the array, text after
- # pattern will be at the end, and between will be any catches made
- # by the pattern.
- #
- $parts = preg_split($block_tag_re, $text, 2,
- PREG_SPLIT_DELIM_CAPTURE);
-
- # If in Markdown span mode, add a empty-string span-level hash
- # after each newline to prevent triggering any block element.
- if ($span) {
- $void = $this->hashPart("", ':');
- $newline = "$void\n";
- $parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
- }
-
- $parsed .= $parts[0]; # Text before current tag.
-
- # If end of $text has been reached. Stop loop.
- if (count($parts) < 3) {
- $text = "";
- break;
- }
-
- $tag = $parts[1]; # Tag to handle.
- $text = $parts[2]; # Remaining text after current tag.
- $tag_re = preg_quote($tag); # For use in a regular expression.
-
- #
- # Check for: Code span marker
- #
- if ($tag{0} == "`") {
- # Find corresponding end marker.
- $tag_re = preg_quote($tag);
- if (preg_match('{^(?>.+?|\n(?!\n))*?(?.*\n)*?[ ]{'.($fence_indent).'}'.$fence_re.'[ ]*(?:\n|$)}', $text,
- $matches))
- {
- # End marker found: pass text unchanged until marker.
- $parsed .= $tag . $matches[0];
- $text = substr($text, strlen($matches[0]));
- }
- else {
- # No end marker: just skip it.
- $parsed .= $tag;
- }
- }
- #
- # Check for: Indented code block.
- #
- else if ($tag{0} == "\n" || $tag{0} == " ") {
- # Indented code block: pass it unchanged, will be handled
- # later.
- $parsed .= $tag;
- }
- #
- # Check for: Opening Block level tag or
- # Opening Context Block tag (like ins and del)
- # used as a block tag (tag is alone on it's line).
- #
- else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
- ( preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
- preg_match($newline_before_re, $parsed) &&
- preg_match($newline_after_re, $text) )
- )
- {
- # Need to parse tag and following text using the HTML parser.
- list($block_text, $text) =
- $this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
-
- # Make sure it stays outside of any paragraph by adding newlines.
- $parsed .= "\n\n$block_text\n\n";
- }
- #
- # Check for: Clean tag (like script, math)
- # HTML Comments, processing instructions.
- #
- else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
- $tag{1} == '!' || $tag{1} == '?')
- {
- # Need to parse tag and following text using the HTML parser.
- # (don't check for markdown attribute)
- list($block_text, $text) =
- $this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
-
- $parsed .= $block_text;
- }
- #
- # Check for: Tag with same name as enclosing tag.
- #
- else if ($enclosing_tag_re !== '' &&
- # Same name as enclosing tag.
- preg_match('{^?(?:'.$enclosing_tag_re.')\b}', $tag))
- {
- #
- # Increase/decrease nested tag count.
- #
- if ($tag{1} == '/') $depth--;
- else if ($tag{strlen($tag)-2} != '/') $depth++;
-
- if ($depth < 0) {
- #
- # Going out of parent element. Clean up and break so we
- # return to the calling function.
- #
- $text = $tag . $text;
- break;
- }
-
- $parsed .= $tag;
- }
- else {
- $parsed .= $tag;
- }
- } while ($depth >= 0);
-
- return array($parsed, $text);
- }
- function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
- #
- # Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
- #
- # * Calls $hash_method to convert any blocks.
- # * Stops when the first opening tag closes.
- # * $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
- # (it is not inside clean tags)
- #
- # Returns an array of that form: ( processed text , remaining text )
- #
- if ($text === '') return array('', '');
-
- # Regex to match `markdown` attribute inside of a tag.
- $markdown_attr_re = '
- {
- \s* # Eat whitespace before the `markdown` attribute
- markdown
- \s*=\s*
- (?>
- (["\']) # $1: quote delimiter
- (.*?) # $2: attribute value
- \1 # matching delimiter
- |
- ([^\s>]*) # $3: unquoted attribute value
- )
- () # $4: make $3 always defined (avoid warnings)
- }xs';
-
- # Regex to match any tag.
- $tag_re = '{
- ( # $2: Capture whole tag.
- ? # Any opening or closing tag.
- [\w:$]+ # Tag name.
- (?:
- (?=[\s"\'/a-zA-Z0-9]) # Allowed characters after tag name.
- (?>
- ".*?" | # Double quotes (can contain `>`)
- \'.*?\' | # Single quotes (can contain `>`)
- .+? # Anything but quotes and `>`.
- )*?
- )?
- > # End of tag.
- |
- # HTML Comment
- |
- <\?.*?\?> | <%.*?%> # Processing instruction
- |
- # CData Block
- )
- }xs';
-
- $original_text = $text; # Save original text in case of faliure.
-
- $depth = 0; # Current depth inside the tag tree.
- $block_text = ""; # Temporary text holder for current text.
- $parsed = ""; # Parsed text that will be returned.
-
- #
- # Get the name of the starting tag.
- # (This pattern makes $base_tag_name_re safe without quoting.)
- #
- if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
- $base_tag_name_re = $matches[1];
-
- #
- # Loop through every tag until we find the corresponding closing tag.
- #
- do {
- #
- # Split the text using the first $tag_match pattern found.
- # Text before pattern will be first in the array, text after
- # pattern will be at the end, and between will be any catches made
- # by the pattern.
- #
- $parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-
- if (count($parts) < 3) {
- #
- # End of $text reached with unbalenced tag(s).
- # In that case, we return original text unchanged and pass the
- # first character as filtered to prevent an infinite loop in the
- # parent function.
- #
- return array($original_text{0}, substr($original_text, 1));
- }
-
- $block_text .= $parts[0]; # Text before current tag.
- $tag = $parts[1]; # Tag to handle.
- $text = $parts[2]; # Remaining text after current tag.
-
- #
- # Check for: Auto-close tag (like
)
- # Comments and Processing Instructions.
- #
- if (preg_match('{^?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
- $tag{1} == '!' || $tag{1} == '?')
- {
- # Just add the tag to the block as if it was text.
- $block_text .= $tag;
- }
- else {
- #
- # Increase/decrease nested tag count. Only do so if
- # the tag's name match base tag's.
- #
- if (preg_match('{^?'.$base_tag_name_re.'\b}', $tag)) {
- if ($tag{1} == '/') $depth--;
- else if ($tag{strlen($tag)-2} != '/') $depth++;
- }
-
- #
- # Check for `markdown="1"` attribute and handle it.
- #
- if ($md_attr &&
- preg_match($markdown_attr_re, $tag, $attr_m) &&
- preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
- {
- # Remove `markdown` attribute from opening tag.
- $tag = preg_replace($markdown_attr_re, '', $tag);
-
- # Check if text inside this tag must be parsed in span mode.
- $this->mode = $attr_m[2] . $attr_m[3];
- $span_mode = $this->mode == 'span' || $this->mode != 'block' &&
- preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
-
- # Calculate indent before tag.
- if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
- $strlen = $this->utf8_strlen;
- $indent = $strlen($matches[1], 'UTF-8');
- } else {
- $indent = 0;
- }
-
- # End preceding block with this tag.
- $block_text .= $tag;
- $parsed .= $this->$hash_method($block_text);
-
- # Get enclosing tag name for the ParseMarkdown function.
- # (This pattern makes $tag_name_re safe without quoting.)
- preg_match('/^<([\w:$]*)\b/', $tag, $matches);
- $tag_name_re = $matches[1];
-
- # Parse the content using the HTML-in-Markdown parser.
- list ($block_text, $text)
- = $this->_hashHTMLBlocks_inMarkdown($text, $indent,
- $tag_name_re, $span_mode);
-
- # Outdent markdown text.
- if ($indent > 0) {
- $block_text = preg_replace("/^[ ]{1,$indent}/m", "",
- $block_text);
- }
-
- # Append tag content to parsed text.
- if (!$span_mode) $parsed .= "\n\n$block_text\n\n";
- else $parsed .= "$block_text";
-
- # Start over with a new block.
- $block_text = "";
- }
- else $block_text .= $tag;
- }
-
- } while ($depth > 0);
-
- #
- # Hash last block text that wasn't processed inside the loop.
- #
- $parsed .= $this->$hash_method($block_text);
-
- return array($parsed, $text);
- }
-
-
- function hashClean($text) {
- #
- # Called whenever a tag must be hashed when a function inserts a "clean" tag
- # in $text, it passes through this function and is automaticaly escaped,
- # blocking invalid nested overlap.
- #
- return $this->hashPart($text, 'C');
- }
-
-
- function doHeaders($text) {
- #
- # Redefined to add id and class attribute support.
- #
- # Setext-style headers:
- # Header 1 {#header1}
- # ========
- #
- # Header 2 {#header2 .class1 .class2}
- # --------
- #
- $text = preg_replace_callback(
- '{
- (^.+?) # $1: Header text
- (?:[ ]+ '.$this->id_class_attr_catch_re.' )? # $3 = id/class attributes
- [ ]*\n(=+|-+)[ ]*\n+ # $3: Header footer
- }mx',
- array(&$this, '_doHeaders_callback_setext'), $text);
-
- # atx-style headers:
- # # Header 1 {#header1}
- # ## Header 2 {#header2}
- # ## Header 2 with closing hashes ## {#header3.class1.class2}
- # ...
- # ###### Header 6 {.class2}
- #
- $text = preg_replace_callback('{
- ^(\#{1,6}) # $1 = string of #\'s
- [ ]*
- (.+?) # $2 = Header text
- [ ]*
- \#* # optional closing #\'s (not counted)
- (?:[ ]+ '.$this->id_class_attr_catch_re.' )? # $3 = id/class attributes
- [ ]*
- \n+
- }xm',
- array(&$this, '_doHeaders_callback_atx'), $text);
-
- return $text;
- }
- function _doHeaders_callback_setext($matches) {
- if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
- return $matches[0];
- $level = $matches[3]{0} == '=' ? 1 : 2;
- $attr = $this->doExtraAttributes("h$level", $dummy =& $matches[2]);
- $block = "".$this->runSpanGamut($matches[1])." ";
- return "\n" . $this->hashBlock($block) . "\n\n";
- }
- function _doHeaders_callback_atx($matches) {
- $level = strlen($matches[1]);
- $attr = $this->doExtraAttributes("h$level", $dummy =& $matches[3]);
- $block = "".$this->runSpanGamut($matches[2])." ";
- return "\n" . $this->hashBlock($block) . "\n\n";
- }
-
-
- function doTables($text) {
- #
- # Form HTML tables.
- #
- $less_than_tab = $this->tab_width - 1;
- #
- # Find tables with leading pipe.
- #
- # | Header 1 | Header 2
- # | -------- | --------
- # | Cell 1 | Cell 2
- # | Cell 3 | Cell 4
- #
- $text = preg_replace_callback('
- {
- ^ # Start of a line
- [ ]{0,'.$less_than_tab.'} # Allowed whitespace.
- [|] # Optional leading pipe (present)
- (.+) \n # $1: Header row (at least one pipe)
-
- [ ]{0,'.$less_than_tab.'} # Allowed whitespace.
- [|] ([ ]*[-:]+[-| :]*) \n # $2: Header underline
-
- ( # $3: Cells
- (?>
- [ ]* # Allowed whitespace.
- [|] .* \n # Row content.
- )*
- )
- (?=\n|\Z) # Stop at final double newline.
- }xm',
- array(&$this, '_doTable_leadingPipe_callback'), $text);
-
- #
- # Find tables without leading pipe.
- #
- # Header 1 | Header 2
- # -------- | --------
- # Cell 1 | Cell 2
- # Cell 3 | Cell 4
- #
- $text = preg_replace_callback('
- {
- ^ # Start of a line
- [ ]{0,'.$less_than_tab.'} # Allowed whitespace.
- (\S.*[|].*) \n # $1: Header row (at least one pipe)
-
- [ ]{0,'.$less_than_tab.'} # Allowed whitespace.
- ([-:]+[ ]*[|][-| :]*) \n # $2: Header underline
-
- ( # $3: Cells
- (?>
- .* [|] .* \n # Row content
- )*
- )
- (?=\n|\Z) # Stop at final double newline.
- }xm',
- array(&$this, '_DoTable_callback'), $text);
-
- return $text;
- }
- function _doTable_leadingPipe_callback($matches) {
- $head = $matches[1];
- $underline = $matches[2];
- $content = $matches[3];
-
- # Remove leading pipe for each row.
- $content = preg_replace('/^ *[|]/m', '', $content);
-
- return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
- }
- function _doTable_callback($matches) {
- $head = $matches[1];
- $underline = $matches[2];
- $content = $matches[3];
-
- # Remove any tailing pipes for each line.
- $head = preg_replace('/[|] *$/m', '', $head);
- $underline = preg_replace('/[|] *$/m', '', $underline);
- $content = preg_replace('/[|] *$/m', '', $content);
-
- # Reading alignement from header underline.
- $separators = preg_split('/ *[|] */', $underline);
- foreach ($separators as $n => $s) {
- if (preg_match('/^ *-+: *$/', $s)) $attr[$n] = ' align="right"';
- else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
- else if (preg_match('/^ *:-+ *$/', $s)) $attr[$n] = ' align="left"';
- else $attr[$n] = '';
- }
-
- # Parsing span elements, including code spans, character escapes,
- # and inline HTML tags, so that pipes inside those gets ignored.
- $head = $this->parseSpan($head);
- $headers = preg_split('/ *[|] */', $head);
- $col_count = count($headers);
-
- # Write column headers.
- $text = "\n";
- $text .= "\n";
- $text .= "\n";
- foreach ($headers as $n => $header)
- $text .= " ".$this->runSpanGamut(trim($header))." \n";
- $text .= " \n";
- $text .= "\n";
-
- # Split content by row.
- $rows = explode("\n", trim($content, "\n"));
-
- $text .= "\n";
- foreach ($rows as $row) {
- # Parsing span elements, including code spans, character escapes,
- # and inline HTML tags, so that pipes inside those gets ignored.
- $row = $this->parseSpan($row);
-
- # Split row by cell.
- $row_cells = preg_split('/ *[|] */', $row, $col_count);
- $row_cells = array_pad($row_cells, $col_count, '');
-
- $text .= "\n";
- foreach ($row_cells as $n => $cell)
- $text .= " ".$this->runSpanGamut(trim($cell))." \n";
- $text .= " \n";
- }
- $text .= "\n";
- $text .= "
";
-
- return $this->hashBlock($text) . "\n";
- }
-
-
- function doDefLists($text) {
- #
- # Form HTML definition lists.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # Re-usable pattern to match any entire dl list:
- $whole_list_re = '(?>
- ( # $1 = whole list
- ( # $2
- [ ]{0,'.$less_than_tab.'}
- ((?>.*\S.*\n)+) # $3 = defined term
- \n?
- [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
- )
- (?s:.+?)
- ( # $4
- \z
- |
- \n{2,}
- (?=\S)
- (?! # Negative lookahead for another term
- [ ]{0,'.$less_than_tab.'}
- (?: \S.*\n )+? # defined term
- \n?
- [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
- )
- (?! # Negative lookahead for another definition
- [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
- )
- )
- )
- )'; // mx
-
- $text = preg_replace_callback('{
- (?>\A\n?|(?<=\n\n))
- '.$whole_list_re.'
- }mx',
- array(&$this, '_doDefLists_callback'), $text);
-
- return $text;
- }
- function _doDefLists_callback($matches) {
- # Re-usable patterns to match list item bullets and number markers:
- $list = $matches[1];
-
- # Turn double returns into triple returns, so that we can make a
- # paragraph for the last item in a list, if necessary:
- $result = trim($this->processDefListItems($list));
- $result = "\n" . $result . "\n
";
- return $this->hashBlock($result) . "\n\n";
- }
-
-
- function processDefListItems($list_str) {
- #
- # Process the contents of a single definition list, splitting it
- # into individual term and definition list items.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # trim trailing blank lines:
- $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
- # Process definition terms.
- $list_str = preg_replace_callback('{
- (?>\A\n?|\n\n+) # leading line
- ( # definition terms = $1
- [ ]{0,'.$less_than_tab.'} # leading whitespace
- (?![:][ ]|[ ]) # negative lookahead for a definition
- # mark (colon) or more whitespace.
- (?> \S.* \n)+? # actual term (not whitespace).
- )
- (?=\n?[ ]{0,3}:[ ]) # lookahead for following line feed
- # with a definition mark.
- }xm',
- array(&$this, '_processDefListItems_callback_dt'), $list_str);
-
- # Process actual definitions.
- $list_str = preg_replace_callback('{
- \n(\n+)? # leading line = $1
- ( # marker space = $2
- [ ]{0,'.$less_than_tab.'} # whitespace before colon
- [:][ ]+ # definition mark (colon)
- )
- ((?s:.+?)) # definition text = $3
- (?= \n+ # stop at next definition mark,
- (?: # next term or end of text
- [ ]{0,'.$less_than_tab.'} [:][ ] |
- | \z
- )
- )
- }xm',
- array(&$this, '_processDefListItems_callback_dd'), $list_str);
-
- return $list_str;
- }
- function _processDefListItems_callback_dt($matches) {
- $terms = explode("\n", trim($matches[1]));
- $text = '';
- foreach ($terms as $term) {
- $term = $this->runSpanGamut(trim($term));
- $text .= "\n" . $term . " ";
- }
- return $text . "\n";
- }
- function _processDefListItems_callback_dd($matches) {
- $leading_line = $matches[1];
- $marker_space = $matches[2];
- $def = $matches[3];
-
- if ($leading_line || preg_match('/\n{2,}/', $def)) {
- # Replace marker with the appropriate whitespace indentation
- $def = str_repeat(' ', strlen($marker_space)) . $def;
- $def = $this->runBlockGamut($this->outdent($def . "\n\n"));
- $def = "\n". $def ."\n";
- }
- else {
- $def = rtrim($def);
- $def = $this->runSpanGamut($this->outdent($def));
- }
-
- return "\n " . $def . " \n";
- }
-
-
- function doFencedCodeBlocks($text) {
- #
- # Adding the fenced code block syntax to regular Markdown:
- #
- # ~~~
- # Code block
- # ~~~
- #
- $less_than_tab = $this->tab_width;
-
- $text = preg_replace_callback('{
- (?:\n|\A)
- # 1: Opening marker
- (
- ~{3,} # Marker: three tilde or more.
- )
- [ ]*
- (?:
- [.]?([-_:a-zA-Z0-9]+) # 2: standalone class name
- |
- '.$this->id_class_attr_catch_re.' # 3: Extra attributes
- )?
- [ ]* \n # Whitespace and newline following marker.
-
- # 4: Content
- (
- (?>
- (?!\1 [ ]* \n) # Not a closing marker.
- .*\n+
- )+
- )
-
- # Closing marker.
- \1 [ ]* \n
- }xm',
- array(&$this, '_doFencedCodeBlocks_callback'), $text);
-
- return $text;
- }
- function _doFencedCodeBlocks_callback($matches) {
- $classname =& $matches[2];
- $attrs =& $matches[3];
- $codeblock = $matches[4];
- $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
- $codeblock = preg_replace_callback('/^\n+/',
- array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
-
- if ($classname != "") {
- if ($classname{0} == '.')
- $classname = substr($classname, 1);
- $attr_str = ' class="'.$this->code_class_prefix.$classname.'"';
- } else {
- $attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs);
- }
- $pre_attr_str = $this->code_attr_on_pre ? $attr_str : '';
- $code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
- $codeblock = "$codeblock
";
-
- return "\n\n".$this->hashBlock($codeblock)."\n\n";
- }
- function _doFencedCodeBlocks_newlines($matches) {
- return str_repeat("
empty_element_suffix",
- strlen($matches[0]));
- }
-
-
- #
- # Redefining emphasis markers so that emphasis by underscore does not
- # work in the middle of a word.
- #
- var $em_relist = array(
- '' => '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? tags
- #
- # Strip leading and trailing lines:
- $text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
- $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
- #
- # Wrap tags and unhashify HTML blocks
- #
- foreach ($grafs as $key => $value) {
- $value = trim($this->runSpanGamut($value));
-
- # Check if this should be enclosed in a paragraph.
- # Clean tag hashes & block tag hashes are left alone.
- $is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
-
- if ($is_p) {
- $value = "
$value
";
- }
- $grafs[$key] = $value;
- }
-
- # Join grafs in one text, then unhash HTML tags.
- $text = implode("\n\n", $grafs);
-
- # Finish by removing any tag hashes still present in $text.
- $text = $this->unhash($text);
-
- return $text;
- }
-
-
- ### Footnotes
-
- function stripFootnotes($text) {
- #
- # Strips link definitions from text, stores the URLs and titles in
- # hash references.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # Link defs are in the form: [^id]: url "optional title"
- $text = preg_replace_callback('{
- ^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?: # note_id = $1
- [ ]*
- \n? # maybe *one* newline
- ( # text = $2 (no blank lines allowed)
- (?:
- .+ # actual text
- |
- \n # newlines but
- (?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
- (?!\n+[ ]{0,3}\S)# ensure line is not blank and followed
- # by non-indented content
- )*
- )
- }xm',
- array(&$this, '_stripFootnotes_callback'),
- $text);
- return $text;
- }
- function _stripFootnotes_callback($matches) {
- $note_id = $this->fn_id_prefix . $matches[1];
- $this->footnotes[$note_id] = $this->outdent($matches[2]);
- return ''; # String that will replace the block
- }
-
-
- function doFootnotes($text) {
- #
- # Replace footnote references in $text [^id] with a special text-token
- # which will be replaced by the actual footnote marker in appendFootnotes.
- #
- if (!$this->in_anchor) {
- $text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
- }
- return $text;
- }
-
-
- function appendFootnotes($text) {
- #
- # Append footnote list to text.
- #
- $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
- array(&$this, '_appendFootnotes_callback'), $text);
-
- if (!empty($this->footnotes_ordered)) {
- $text .= "\n\n";
- $text .= "\n";
- $text .= "
empty_element_suffix ."\n";
- $text .= "\n\n";
-
- $attr = " rev=\"footnote\"";
- if ($this->fn_backlink_class != "") {
- $class = $this->fn_backlink_class;
- $class = $this->encodeAttribute($class);
- $attr .= " class=\"$class\"";
- }
- if ($this->fn_backlink_title != "") {
- $title = $this->fn_backlink_title;
- $title = $this->encodeAttribute($title);
- $attr .= " title=\"$title\"";
- }
- $num = 0;
-
- while (!empty($this->footnotes_ordered)) {
- $footnote = reset($this->footnotes_ordered);
- $note_id = key($this->footnotes_ordered);
- unset($this->footnotes_ordered[$note_id]);
- $ref_count = $this->footnotes_ref_count[$note_id];
- unset($this->footnotes_ref_count[$note_id]);
- unset($this->footnotes[$note_id]);
-
- $footnote .= "\n"; # Need to append newline before parsing.
- $footnote = $this->runBlockGamut("$footnote\n");
- $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
- array(&$this, '_appendFootnotes_callback'), $footnote);
-
- $attr = str_replace("%%", ++$num, $attr);
- $note_id = $this->encodeAttribute($note_id);
-
- # Prepare backlink, multiple backlinks if multiple references
- $backlink = "↩";
- for ($ref_num = 2; $ref_num <= $ref_count; ++$ref_num) {
- $backlink .= " ↩";
- }
- # Add backlink to last paragraph; create new paragraph if needed.
- if (preg_match('{$}', $footnote)) {
- $footnote = substr($footnote, 0, -4) . " $backlink";
- } else {
- $footnote .= "\n\n$backlink
";
- }
-
- $text .= "- \n";
- $text .= $footnote . "\n";
- $text .= "
\n\n";
- }
-
- $text .= "
\n";
- $text .= "";
- }
- return $text;
- }
- function _appendFootnotes_callback($matches) {
- $node_id = $this->fn_id_prefix . $matches[1];
-
- # Create footnote marker only if it has a corresponding footnote *and*
- # the footnote hasn't been used by another marker.
- if (isset($this->footnotes[$node_id])) {
- $num =& $this->footnotes_numbers[$node_id];
- if (!isset($num)) {
- # Transfer footnote content to the ordered list and give it its
- # number
- $this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
- $this->footnotes_ref_count[$node_id] = 1;
- $num = $this->footnote_counter++;
- $ref_count_mark = '';
- } else {
- $ref_count_mark = $this->footnotes_ref_count[$node_id] += 1;
- }
-
- $attr = " rel=\"footnote\"";
- if ($this->fn_link_class != "") {
- $class = $this->fn_link_class;
- $class = $this->encodeAttribute($class);
- $attr .= " class=\"$class\"";
- }
- if ($this->fn_link_title != "") {
- $title = $this->fn_link_title;
- $title = $this->encodeAttribute($title);
- $attr .= " title=\"$title\"";
- }
-
- $attr = str_replace("%%", $num, $attr);
- $node_id = $this->encodeAttribute($node_id);
-
- return
- "".
- "$num".
- "";
- }
-
- return "[^".$matches[1]."]";
- }
-
-
- ### Abbreviations ###
-
- function stripAbbreviations($text) {
- #
- # Strips abbreviations from text, stores titles in hash references.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # Link defs are in the form: [id]*: url "optional title"
- $text = preg_replace_callback('{
- ^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?: # abbr_id = $1
- (.*) # text = $2 (no blank lines allowed)
- }xm',
- array(&$this, '_stripAbbreviations_callback'),
- $text);
- return $text;
- }
- function _stripAbbreviations_callback($matches) {
- $abbr_word = $matches[1];
- $abbr_desc = $matches[2];
- if ($this->abbr_word_re)
- $this->abbr_word_re .= '|';
- $this->abbr_word_re .= preg_quote($abbr_word);
- $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
- return ''; # String that will replace the block
- }
-
-
- function doAbbreviations($text) {
- #
- # Find defined abbreviations in text and wrap them in elements.
- #
- if ($this->abbr_word_re) {
- // cannot use the /x modifier because abbr_word_re may
- // contain significant spaces:
- $text = preg_replace_callback('{'.
- '(?abbr_word_re.')'.
- '(?![\w\x1A])'.
- '}',
- array(&$this, '_doAbbreviations_callback'), $text);
- }
- return $text;
- }
- function _doAbbreviations_callback($matches) {
- $abbr = $matches[0];
- if (isset($this->abbr_desciptions[$abbr])) {
- $desc = $this->abbr_desciptions[$abbr];
- if (empty($desc)) {
- return $this->hashPart("$abbr");
- } else {
- $desc = $this->encodeAttribute($desc);
- return $this->hashPart("$abbr");
- }
- } else {
- return $matches[0];
- }
- }
-
-}
-
-
-/*
-
-PHP Markdown Extra
-==================
-
-Description
------------
-
-This is a PHP port of the original Markdown formatter written in Perl
-by John Gruber. This special "Extra" version of PHP Markdown features
-further enhancements to the syntax for making additional constructs
-such as tables and definition list.
-
-Markdown is a text-to-HTML filter; it translates an easy-to-read /
-easy-to-write structured text format into HTML. Markdown's text format
-is mostly similar to that of plain text email, and supports features such
-as headers, *emphasis*, code blocks, blockquotes, and links.
-
-Markdown's syntax is designed not as a generic markup language, but
-specifically to serve as a front-end to (X)HTML. You can use span-level
-HTML tags anywhere in a Markdown document, and you can use block level
-HTML tags (like and as well).
-
-For more information about Markdown's syntax, see:
-
-
-
-
-Bugs
-----
-
-To file bug reports please send email to:
-
-
-
-Please include with your report: (1) the example input; (2) the output you
-expected; (3) the output Markdown actually produced.
-
-
-Version History
----------------
-
-See the readme file for detailed release notes for this version.
-
-
-Copyright and License
----------------------
-
-PHP Markdown & Extra
-Copyright (c) 2004-2013 Michel Fortin
-
-All rights reserved.
-
-Based on Markdown
-Copyright (c) 2003-2006 John Gruber
-
-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.
-
-* Neither the name "Markdown" nor the names of its contributors may
- be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-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 owner
-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.
-
-*/
-?>
\ No newline at end of file
diff --git a/vendor/phpquickprofiler/display.php b/vendor/phpquickprofiler/display.php
index a8633f1a75..1172ec35f3 100644
--- a/vendor/phpquickprofiler/display.php
+++ b/vendor/phpquickprofiler/display.php
@@ -329,7 +329,7 @@ function preventDefault(e) {
{
$output .= ''.\Security::htmlentities($value).'';
}
- $output .= str_repeat('› ', $depth).$item.'';
+ $output .= str_repeat('› ', $depth).\Security::htmlentities($item).'';
if($class == '') $class = 'pqp-alt'; else $class = '';
is_array($value) and $output .= $printarray($value, $depth + 1, $class, $count);
is_object($value) and $output .= $printarray($value, $depth + 1, $class, $count);
@@ -417,6 +417,7 @@ function preventDefault(e) {
$class = '';
foreach($output['logs']['console'] as $log) {
+ $log['data'] = \Security::htmlentities($log['data']);
$return_output .='
'.$log['type'].'
';
@@ -490,7 +491,7 @@ function preventDefault(e) {
$return_output .='
'.$query['sql'];
$return_output .='';
- $return_output .='Speed: '.$query['time'].'';
+ $return_output .='Connection name: '.$query['dbname'].'
Speed: '.$query['time'].'';
$query['duplicate'] and $return_output .=' · DUPLICATE';
if(isset($query['explain'])) {
$return_output .= '
Query analysis:';
diff --git a/vendor/phpseclib/AUTHORS b/vendor/phpseclib/AUTHORS
new file mode 100644
index 0000000000..e175f9f22c
--- /dev/null
+++ b/vendor/phpseclib/AUTHORS
@@ -0,0 +1,5 @@
+phpseclib Lead Developer: TerraFrost (Jim Wigginton)
+
+phpseclib Developers: monnerat (Patrick Monnerat)
+ bantu (Andreas Fischer)
+ petrich (Hans-Jürgen Petrich)
diff --git a/vendor/phpseclib/Crypt/AES.php b/vendor/phpseclib/Crypt/AES.php
index da4fcee9a0..0251ac10e7 100644
--- a/vendor/phpseclib/Crypt/AES.php
+++ b/vendor/phpseclib/Crypt/AES.php
@@ -6,13 +6,13 @@
/**
* Pure-PHP implementation of AES.
*
- * Uses mcrypt, if available, and an internal implementation, otherwise.
+ * Uses mcrypt, if available/possible, and an internal implementation, otherwise.
*
* PHP versions 4 and 5
*
* If {@link Crypt_AES::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
* {@link Crypt_AES::setKey() setKey()}. ie. if the key is 128-bits, the key length will be 128-bits. If it's 136-bits
- * it'll be null-padded to 160-bits and 160 bits will be the key length until {@link Crypt_Rijndael::setKey() setKey()}
+ * it'll be null-padded to 192-bits and 192 bits will be the key length until {@link Crypt_AES::setKey() setKey()}
* is called, again, at which point, it'll be recalculated.
*
* Since Crypt_AES extends Crypt_Rijndael, some functions are available to be called that, in the context of AES, don't
@@ -22,7 +22,7 @@
* Here's a short example of how to use this library:
*
*
- * @copyright MMVIII Jim Wigginton
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @version $Id: AES.php,v 1.7 2010/02/09 06:10:25 terrafrost Exp $
- * @link http://phpseclib.sourceforge.net
+ * @category Crypt
+ * @package Crypt_AES
+ * @author Jim Wigginton
+ * @copyright MMVIII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
*/
+/**
+ * Make sure we have the base loaded
+ */
+class_exists('PHPSecLib\Crypt_Base');
+
/**#@+
* @access public
* @see Crypt_AES::encrypt()
@@ -77,176 +81,71 @@
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
*/
-define('CRYPT_AES_MODE_CTR', -1);
+define('CRYPT_AES_MODE_CTR', CRYPT_MODE_CTR);
/**
* Encrypt / decrypt using the Electronic Code Book mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
*/
-define('CRYPT_AES_MODE_ECB', 1);
+define('CRYPT_AES_MODE_ECB', CRYPT_MODE_ECB);
/**
* Encrypt / decrypt using the Code Book Chaining mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
*/
-define('CRYPT_AES_MODE_CBC', 2);
+define('CRYPT_AES_MODE_CBC', CRYPT_MODE_CBC);
/**
* Encrypt / decrypt using the Cipher Feedback mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
*/
-define('CRYPT_AES_MODE_CFB', 3);
+define('CRYPT_AES_MODE_CFB', CRYPT_MODE_CFB);
/**
* Encrypt / decrypt using the Cipher Feedback mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
*/
-define('CRYPT_AES_MODE_OFB', 4);
+define('CRYPT_AES_MODE_OFB', CRYPT_MODE_OFB);
/**#@-*/
/**#@+
* @access private
- * @see Crypt_AES::Crypt_AES()
+ * @see Crypt_Base::__construct()
*/
/**
* Toggles the internal implementation
*/
-define('CRYPT_AES_MODE_INTERNAL', 1);
+define('CRYPT_AES_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
/**
* Toggles the mcrypt implementation
*/
-define('CRYPT_AES_MODE_MCRYPT', 2);
+define('CRYPT_AES_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
/**#@-*/
/**
* Pure-PHP implementation of AES.
*
+ * @package Crypt_AES
* @author Jim Wigginton
- * @version 0.1.0
* @access public
- * @package Crypt_AES
*/
-class Crypt_AES extends Crypt_Rijndael {
+class Crypt_AES extends Crypt_Rijndael
+{
/**
- * mcrypt resource for encryption
- *
- * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
- * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+ * The namespace used by the cipher for its constants.
*
- * @see Crypt_AES::encrypt()
+ * @see Crypt_Base::const_namespace
* @var String
* @access private
*/
- var $enmcrypt;
-
- /**
- * mcrypt resource for decryption
- *
- * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
- * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
- *
- * @see Crypt_AES::decrypt()
- * @var String
- * @access private
- */
- var $demcrypt;
-
- /**
- * mcrypt resource for CFB mode
- *
- * @see Crypt_AES::encrypt()
- * @see Crypt_AES::decrypt()
- * @var String
- * @access private
- */
- var $ecb;
-
- /**
- * Default Constructor.
- *
- * Determines whether or not the mcrypt extension should be used. $mode should only, at present, be
- * CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC. If not explictly set, CRYPT_AES_MODE_CBC will be used.
- *
- * @param optional Integer $mode
- * @return Crypt_AES
- * @access public
- */
- function __construct($mode = CRYPT_AES_MODE_CBC)
- {
- if ( !defined('CRYPT_AES_MODE') ) {
- switch (true) {
- case extension_loaded('mcrypt'):
- // i'd check to see if aes was supported, by doing in_array('des', mcrypt_list_algorithms('')),
- // but since that can be changed after the object has been created, there doesn't seem to be
- // a lot of point...
- define('CRYPT_AES_MODE', CRYPT_AES_MODE_MCRYPT);
- break;
- default:
- define('CRYPT_AES_MODE', CRYPT_AES_MODE_INTERNAL);
- }
- }
-
- switch ( CRYPT_AES_MODE ) {
- case CRYPT_AES_MODE_MCRYPT:
- switch ($mode) {
- case CRYPT_AES_MODE_ECB:
- $this->paddable = true;
- $this->mode = MCRYPT_MODE_ECB;
- break;
- case CRYPT_AES_MODE_CTR:
- // ctr doesn't have a constant associated with it even though it appears to be fairly widely
- // supported. in lieu of knowing just how widely supported it is, i've, for now, opted not to
- // include a compatibility layer. the layer has been implemented but, for now, is commented out.
- $this->mode = 'ctr';
- //$this->mode = in_array('ctr', mcrypt_list_modes()) ? 'ctr' : CRYPT_AES_MODE_CTR;
- break;
- case CRYPT_AES_MODE_CFB:
- $this->mode = 'ncfb';
- break;
- case CRYPT_AES_MODE_OFB:
- $this->mode = MCRYPT_MODE_NOFB;
- break;
- case CRYPT_AES_MODE_CBC:
- default:
- $this->paddable = true;
- $this->mode = MCRYPT_MODE_CBC;
- }
-
- $this->debuffer = $this->enbuffer = '';
-
- break;
- default:
- switch ($mode) {
- case CRYPT_AES_MODE_ECB:
- $this->paddable = true;
- $this->mode = CRYPT_RIJNDAEL_MODE_ECB;
- break;
- case CRYPT_AES_MODE_CTR:
- $this->mode = CRYPT_RIJNDAEL_MODE_CTR;
- break;
- case CRYPT_AES_MODE_CFB:
- $this->mode = CRYPT_RIJNDAEL_MODE_CFB;
- break;
- case CRYPT_AES_MODE_OFB:
- $this->mode = CRYPT_RIJNDAEL_MODE_OFB;
- break;
- case CRYPT_AES_MODE_CBC:
- default:
- $this->paddable = true;
- $this->mode = CRYPT_RIJNDAEL_MODE_CBC;
- }
- }
-
- if (CRYPT_AES_MODE == CRYPT_AES_MODE_INTERNAL) {
- parent::__construct($this->mode);
- }
- }
+ var $const_namespace = 'AES';
/**
* Dummy function
*
* Since Crypt_AES extends Crypt_Rijndael, this function is, technically, available, but it doesn't do anything.
*
+ * @see Crypt_Rijndael::setBlockLength()
* @access public
* @param Integer $length
*/
@@ -254,338 +153,4 @@ function setBlockLength($length)
{
return;
}
-
- /**
- * Encrypts a message.
- *
- * $plaintext will be padded with up to 16 additional bytes. Other AES implementations may or may not pad in the
- * same manner. Other common approaches to padding and the reasons why it's necessary are discussed in the following
- * URL:
- *
- * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
- *
- * An alternative to padding is to, separately, send the length of the file. This is what SSH, in fact, does.
- * strlen($plaintext) will still need to be a multiple of 16, however, arbitrary values can be added to make it that
- * length.
- *
- * @see Crypt_AES::decrypt()
- * @access public
- * @param String $plaintext
- */
- function encrypt($plaintext)
- {
- if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
- $changed = $this->changed;
- $this->_mcryptSetup();
- /*
- if ($this->mode == CRYPT_AES_MODE_CTR) {
- $iv = $this->encryptIV;
- $xor = mcrypt_generic($this->enmcrypt, $this->_generate_xor(strlen($plaintext), $iv));
- $ciphertext = $plaintext ^ $xor;
- if ($this->continuousBuffer) {
- $this->encryptIV = $iv;
- }
- return $ciphertext;
- }
- */
- // re: http://phpseclib.sourceforge.net/cfb-demo.phps
- // using mcrypt's default handing of CFB the above would output two different things. using phpseclib's
- // rewritten CFB implementation the above outputs the same thing twice.
- if ($this->mode == 'ncfb') {
- if ($changed) {
- $this->ecb = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, '');
- mcrypt_generic_init($this->ecb, $this->key, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
- }
-
- if (strlen($this->enbuffer)) {
- $ciphertext = $plaintext ^ substr($this->encryptIV, strlen($this->enbuffer));
- $this->enbuffer.= $ciphertext;
- if (strlen($this->enbuffer) == 16) {
- $this->encryptIV = $this->enbuffer;
- $this->enbuffer = '';
- mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
- }
- $plaintext = substr($plaintext, strlen($ciphertext));
- } else {
- $ciphertext = '';
- }
-
- $last_pos = strlen($plaintext) & 0xFFFFFFF0;
- $ciphertext.= $last_pos ? mcrypt_generic($this->enmcrypt, substr($plaintext, 0, $last_pos)) : '';
-
- if (strlen($plaintext) & 0xF) {
- if (strlen($ciphertext)) {
- $this->encryptIV = substr($ciphertext, -16);
- }
- $this->encryptIV = mcrypt_generic($this->ecb, $this->encryptIV);
- $this->enbuffer = substr($plaintext, $last_pos) ^ $this->encryptIV;
- $ciphertext.= $this->enbuffer;
- }
-
- return $ciphertext;
- }
-
- if ($this->paddable) {
- $plaintext = $this->_pad($plaintext);
- }
-
- $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
-
- if (!$this->continuousBuffer) {
- mcrypt_generic_init($this->enmcrypt, $this->key, $this->iv);
- }
-
- return $ciphertext;
- }
-
- return parent::encrypt($plaintext);
- }
-
- /**
- * Decrypts a message.
- *
- * If strlen($ciphertext) is not a multiple of 16, null bytes will be added to the end of the string until it is.
- *
- * @see Crypt_AES::encrypt()
- * @access public
- * @param String $ciphertext
- */
- function decrypt($ciphertext)
- {
- if ( CRYPT_AES_MODE == CRYPT_AES_MODE_MCRYPT ) {
- $changed = $this->changed;
- $this->_mcryptSetup();
- /*
- if ($this->mode == CRYPT_AES_MODE_CTR) {
- $iv = $this->decryptIV;
- $xor = mcrypt_generic($this->enmcrypt, $this->_generate_xor(strlen($ciphertext), $iv));
- $plaintext = $ciphertext ^ $xor;
- if ($this->continuousBuffer) {
- $this->decryptIV = $iv;
- }
- return $plaintext;
- }
- */
- if ($this->mode == 'ncfb') {
- if ($changed) {
- $this->ecb = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, '');
- mcrypt_generic_init($this->ecb, $this->key, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
- }
-
- if (strlen($this->debuffer)) {
- $plaintext = $ciphertext ^ substr($this->decryptIV, strlen($this->debuffer));
-
- $this->debuffer.= substr($ciphertext, 0, strlen($plaintext));
- if (strlen($this->debuffer) == 16) {
- $this->decryptIV = $this->debuffer;
- $this->debuffer = '';
- mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
- }
- $ciphertext = substr($ciphertext, strlen($plaintext));
- } else {
- $plaintext = '';
- }
-
- $last_pos = strlen($ciphertext) & 0xFFFFFFF0;
- $plaintext.= $last_pos ? mdecrypt_generic($this->demcrypt, substr($ciphertext, 0, $last_pos)) : '';
-
- if (strlen($ciphertext) & 0xF) {
- if (strlen($plaintext)) {
- $this->decryptIV = substr($ciphertext, $last_pos - 16, 16);
- }
- $this->decryptIV = mcrypt_generic($this->ecb, $this->decryptIV);
- $this->debuffer = substr($ciphertext, $last_pos);
- $plaintext.= $this->debuffer ^ $this->decryptIV;
- }
-
- return $plaintext;
- }
-
- if ($this->paddable) {
- // we pad with chr(0) since that's what mcrypt_generic does. to quote from http://php.net/function.mcrypt-generic :
- // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
- $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 15) & 0xFFFFFFF0, chr(0));
- }
-
- $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
-
- if (!$this->continuousBuffer) {
- mcrypt_generic_init($this->demcrypt, $this->key, $this->iv);
- }
-
- return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
- }
-
- return parent::decrypt($ciphertext);
- }
-
- /**
- * Setup mcrypt
- *
- * Validates all the variables.
- *
- * @access private
- */
- function _mcryptSetup()
- {
- if (!$this->changed) {
- return;
- }
-
- if (!$this->explicit_key_length) {
- // this just copied from Crypt_Rijndael::_setup()
- $length = strlen($this->key) >> 2;
- if ($length > 8) {
- $length = 8;
- } else if ($length < 4) {
- $length = 4;
- }
- $this->Nk = $length;
- $this->key_size = $length << 2;
- }
-
- switch ($this->Nk) {
- case 4: // 128
- $this->key_size = 16;
- break;
- case 5: // 160
- case 6: // 192
- $this->key_size = 24;
- break;
- case 7: // 224
- case 8: // 256
- $this->key_size = 32;
- }
-
- $this->key = str_pad(substr($this->key, 0, $this->key_size), $this->key_size, chr(0));
- $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($this->iv, 0, 16), 16, chr(0));
-
- if (!isset($this->enmcrypt)) {
- $mode = $this->mode;
- //$mode = $this->mode == CRYPT_AES_MODE_CTR ? MCRYPT_MODE_ECB : $this->mode;
-
- $this->demcrypt = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', $mode, '');
- $this->enmcrypt = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', $mode, '');
- } // else should mcrypt_generic_deinit be called?
-
- mcrypt_generic_init($this->demcrypt, $this->key, $this->iv);
- mcrypt_generic_init($this->enmcrypt, $this->key, $this->iv);
-
- $this->changed = false;
- }
-
- /**
- * Encrypts a block
- *
- * Optimized over Crypt_Rijndael's implementation by means of loop unrolling.
- *
- * @see Crypt_Rijndael::_encryptBlock()
- * @access private
- * @param String $in
- * @return String
- */
- function _encryptBlock($in)
- {
- $state = unpack('N*word', $in);
-
- $Nr = $this->Nr;
- $w = $this->w;
- $t0 = $this->t0;
- $t1 = $this->t1;
- $t2 = $this->t2;
- $t3 = $this->t3;
-
- // addRoundKey and reindex $state
- $state = array(
- $state['word1'] ^ $w[0][0],
- $state['word2'] ^ $w[0][1],
- $state['word3'] ^ $w[0][2],
- $state['word4'] ^ $w[0][3]
- );
-
- // shiftRows + subWord + mixColumns + addRoundKey
- // we could loop unroll this and use if statements to do more rounds as necessary, but, in my tests, that yields
- // only a marginal improvement. since that also, imho, hinders the readability of the code, i've opted not to do it.
- for ($round = 1; $round < $this->Nr; $round++) {
- $state = array(
- $t0[$state[0] & 0xFF000000] ^ $t1[$state[1] & 0x00FF0000] ^ $t2[$state[2] & 0x0000FF00] ^ $t3[$state[3] & 0x000000FF] ^ $w[$round][0],
- $t0[$state[1] & 0xFF000000] ^ $t1[$state[2] & 0x00FF0000] ^ $t2[$state[3] & 0x0000FF00] ^ $t3[$state[0] & 0x000000FF] ^ $w[$round][1],
- $t0[$state[2] & 0xFF000000] ^ $t1[$state[3] & 0x00FF0000] ^ $t2[$state[0] & 0x0000FF00] ^ $t3[$state[1] & 0x000000FF] ^ $w[$round][2],
- $t0[$state[3] & 0xFF000000] ^ $t1[$state[0] & 0x00FF0000] ^ $t2[$state[1] & 0x0000FF00] ^ $t3[$state[2] & 0x000000FF] ^ $w[$round][3]
- );
-
- }
-
- // subWord
- $state = array(
- $this->_subWord($state[0]),
- $this->_subWord($state[1]),
- $this->_subWord($state[2]),
- $this->_subWord($state[3])
- );
-
- // shiftRows + addRoundKey
- $state = array(
- ($state[0] & 0xFF000000) ^ ($state[1] & 0x00FF0000) ^ ($state[2] & 0x0000FF00) ^ ($state[3] & 0x000000FF) ^ $this->w[$this->Nr][0],
- ($state[1] & 0xFF000000) ^ ($state[2] & 0x00FF0000) ^ ($state[3] & 0x0000FF00) ^ ($state[0] & 0x000000FF) ^ $this->w[$this->Nr][1],
- ($state[2] & 0xFF000000) ^ ($state[3] & 0x00FF0000) ^ ($state[0] & 0x0000FF00) ^ ($state[1] & 0x000000FF) ^ $this->w[$this->Nr][2],
- ($state[3] & 0xFF000000) ^ ($state[0] & 0x00FF0000) ^ ($state[1] & 0x0000FF00) ^ ($state[2] & 0x000000FF) ^ $this->w[$this->Nr][3]
- );
-
- return pack('N*', $state[0], $state[1], $state[2], $state[3]);
- }
-
- /**
- * Decrypts a block
- *
- * Optimized over Crypt_Rijndael's implementation by means of loop unrolling.
- *
- * @see Crypt_Rijndael::_decryptBlock()
- * @access private
- * @param String $in
- * @return String
- */
- function _decryptBlock($in)
- {
- $state = unpack('N*word', $in);
-
- $Nr = $this->Nr;
- $dw = $this->dw;
- $dt0 = $this->dt0;
- $dt1 = $this->dt1;
- $dt2 = $this->dt2;
- $dt3 = $this->dt3;
-
- // addRoundKey and reindex $state
- $state = array(
- $state['word1'] ^ $dw[$this->Nr][0],
- $state['word2'] ^ $dw[$this->Nr][1],
- $state['word3'] ^ $dw[$this->Nr][2],
- $state['word4'] ^ $dw[$this->Nr][3]
- );
-
-
- // invShiftRows + invSubBytes + invMixColumns + addRoundKey
- for ($round = $this->Nr - 1; $round > 0; $round--) {
- $state = array(
- $dt0[$state[0] & 0xFF000000] ^ $dt1[$state[3] & 0x00FF0000] ^ $dt2[$state[2] & 0x0000FF00] ^ $dt3[$state[1] & 0x000000FF] ^ $dw[$round][0],
- $dt0[$state[1] & 0xFF000000] ^ $dt1[$state[0] & 0x00FF0000] ^ $dt2[$state[3] & 0x0000FF00] ^ $dt3[$state[2] & 0x000000FF] ^ $dw[$round][1],
- $dt0[$state[2] & 0xFF000000] ^ $dt1[$state[1] & 0x00FF0000] ^ $dt2[$state[0] & 0x0000FF00] ^ $dt3[$state[3] & 0x000000FF] ^ $dw[$round][2],
- $dt0[$state[3] & 0xFF000000] ^ $dt1[$state[2] & 0x00FF0000] ^ $dt2[$state[1] & 0x0000FF00] ^ $dt3[$state[0] & 0x000000FF] ^ $dw[$round][3]
- );
- }
-
- // invShiftRows + invSubWord + addRoundKey
- $state = array(
- $this->_invSubWord(($state[0] & 0xFF000000) ^ ($state[3] & 0x00FF0000) ^ ($state[2] & 0x0000FF00) ^ ($state[1] & 0x000000FF)) ^ $dw[0][0],
- $this->_invSubWord(($state[1] & 0xFF000000) ^ ($state[0] & 0x00FF0000) ^ ($state[3] & 0x0000FF00) ^ ($state[2] & 0x000000FF)) ^ $dw[0][1],
- $this->_invSubWord(($state[2] & 0xFF000000) ^ ($state[1] & 0x00FF0000) ^ ($state[0] & 0x0000FF00) ^ ($state[3] & 0x000000FF)) ^ $dw[0][2],
- $this->_invSubWord(($state[3] & 0xFF000000) ^ ($state[2] & 0x00FF0000) ^ ($state[1] & 0x0000FF00) ^ ($state[0] & 0x000000FF)) ^ $dw[0][3]
- );
-
- return pack('N*', $state[0], $state[1], $state[2], $state[3]);
- }
}
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/vendor/phpseclib/Crypt/Base.php b/vendor/phpseclib/Crypt/Base.php
new file mode 100644
index 0000000000..b36c7d964f
--- /dev/null
+++ b/vendor/phpseclib/Crypt/Base.php
@@ -0,0 +1,2008 @@
+
+ * @author Hans-Juergen Petrich
+ * @copyright MMVII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
+ */
+
+/**#@+
+ * @access public
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_Base::decrypt()
+ */
+/**
+ * Encrypt / decrypt using the Counter mode.
+ *
+ * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+ */
+define('CRYPT_MODE_CTR', -1);
+/**
+ * Encrypt / decrypt using the Electronic Code Book mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+ */
+define('CRYPT_MODE_ECB', 1);
+/**
+ * Encrypt / decrypt using the Code Book Chaining mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+ */
+define('CRYPT_MODE_CBC', 2);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+ */
+define('CRYPT_MODE_CFB', 3);
+/**
+ * Encrypt / decrypt using the Output Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+ */
+define('CRYPT_MODE_OFB', 4);
+/**
+ * Encrypt / decrypt using streaming mode.
+ *
+ */
+define('CRYPT_MODE_STREAM', 5);
+/**#@-*/
+
+/**#@+
+ * @access private
+ * @see Crypt_Base::__construct()
+ */
+/**
+ * Base value for the internal implementation $engine switch
+ */
+define('CRYPT_MODE_INTERNAL', 1);
+/**
+ * Base value for the mcrypt implementation $engine switch
+ */
+define('CRYPT_MODE_MCRYPT', 2);
+/**#@-*/
+
+/**
+ * Base Class for all Crypt_* cipher classes
+ *
+ * @package Crypt_Base
+ * @author Jim Wigginton
+ * @author Hans-Juergen Petrich
+ * @access public
+ */
+class Crypt_Base
+{
+ /**
+ * The Encryption Mode
+ *
+ * @see Crypt_Base::__construct()
+ * @var Integer
+ * @access private
+ */
+ var $mode;
+
+ /**
+ * The Block Length of the block cipher
+ *
+ * @var Integer
+ * @access private
+ */
+ var $block_size = 16;
+
+ /**
+ * The Key
+ *
+ * @see Crypt_Base::setKey()
+ * @var String
+ * @access private
+ */
+ var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+
+ /**
+ * The Initialization Vector
+ *
+ * @see Crypt_Base::setIV()
+ * @var String
+ * @access private
+ */
+ var $iv;
+
+ /**
+ * A "sliding" Initialization Vector
+ *
+ * @see Crypt_Base::enableContinuousBuffer()
+ * @see Crypt_Base::_clearBuffers()
+ * @var String
+ * @access private
+ */
+ var $encryptIV;
+
+ /**
+ * A "sliding" Initialization Vector
+ *
+ * @see Crypt_Base::enableContinuousBuffer()
+ * @see Crypt_Base::_clearBuffers()
+ * @var String
+ * @access private
+ */
+ var $decryptIV;
+
+ /**
+ * Continuous Buffer status
+ *
+ * @see Crypt_Base::enableContinuousBuffer()
+ * @var Boolean
+ * @access private
+ */
+ var $continuousBuffer = false;
+
+ /**
+ * Encryption buffer for CTR, OFB and CFB modes
+ *
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_Base::_clearBuffers()
+ * @var Array
+ * @access private
+ */
+ var $enbuffer;
+
+ /**
+ * Decryption buffer for CTR, OFB and CFB modes
+ *
+ * @see Crypt_Base::decrypt()
+ * @see Crypt_Base::_clearBuffers()
+ * @var Array
+ * @access private
+ */
+ var $debuffer;
+
+ /**
+ * mcrypt resource for encryption
+ *
+ * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
+ * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+ *
+ * @see Crypt_Base::encrypt()
+ * @var Resource
+ * @access private
+ */
+ var $enmcrypt;
+
+ /**
+ * mcrypt resource for decryption
+ *
+ * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
+ * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+ *
+ * @see Crypt_Base::decrypt()
+ * @var Resource
+ * @access private
+ */
+ var $demcrypt;
+
+ /**
+ * Does the enmcrypt resource need to be (re)initialized?
+ *
+ * @see Crypt_Twofish::setKey()
+ * @see Crypt_Twofish::setIV()
+ * @var Boolean
+ * @access private
+ */
+ var $enchanged = true;
+
+ /**
+ * Does the demcrypt resource need to be (re)initialized?
+ *
+ * @see Crypt_Twofish::setKey()
+ * @see Crypt_Twofish::setIV()
+ * @var Boolean
+ * @access private
+ */
+ var $dechanged = true;
+
+ /**
+ * mcrypt resource for CFB mode
+ *
+ * mcrypt's CFB mode, in (and only in) buffered context,
+ * is broken, so phpseclib implements the CFB mode by it self,
+ * even when the mcrypt php extension is available.
+ *
+ * In order to do the CFB-mode work (fast) phpseclib
+ * use a separate ECB-mode mcrypt resource.
+ *
+ * @link http://phpseclib.sourceforge.net/cfb-demo.phps
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_Base::decrypt()
+ * @see Crypt_Base::_setupMcrypt()
+ * @var Resource
+ * @access private
+ */
+ var $ecb;
+
+ /**
+ * Optimizing value while CFB-encrypting
+ *
+ * Only relevant if $continuousBuffer enabled
+ * and $engine == CRYPT_MODE_MCRYPT
+ *
+ * It's faster to re-init $enmcrypt if
+ * $buffer bytes > $cfb_init_len than
+ * using the $ecb resource furthermore.
+ *
+ * This value depends of the chosen cipher
+ * and the time it would be needed for it's
+ * initialization [by mcrypt_generic_init()]
+ * which, typically, depends on the complexity
+ * on its internaly Key-expanding algorithm.
+ *
+ * @see Crypt_Base::encrypt()
+ * @var Integer
+ * @access private
+ */
+ var $cfb_init_len = 600;
+
+ /**
+ * Does internal cipher state need to be (re)initialized?
+ *
+ * @see setKey()
+ * @see setIV()
+ * @see disableContinuousBuffer()
+ * @var Boolean
+ * @access private
+ */
+ var $changed = true;
+
+ /**
+ * Padding status
+ *
+ * @see Crypt_Base::enablePadding()
+ * @var Boolean
+ * @access private
+ */
+ var $padding = true;
+
+ /**
+ * Is the mode one that is paddable?
+ *
+ * @see Crypt_Base::__construct()
+ * @var Boolean
+ * @access private
+ */
+ var $paddable = false;
+
+ /**
+ * Holds which crypt engine internaly should be use,
+ * which will be determined automatically on __construct()
+ *
+ * Currently available $engines are:
+ * - CRYPT_MODE_MCRYPT (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
+ * - CRYPT_MODE_INTERNAL (slower, pure php-engine, no php-extension required)
+ *
+ * In the pipeline... maybe. But currently not available:
+ * - CRYPT_MODE_OPENSSL (very fast, php-extension: openssl, extension_loaded('openssl') required)
+ *
+ * If possible, CRYPT_MODE_MCRYPT will be used for each cipher.
+ * Otherwise CRYPT_MODE_INTERNAL
+ *
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_Base::decrypt()
+ * @var Integer
+ * @access private
+ */
+ var $engine;
+
+ /**
+ * The mcrypt specific name of the cipher
+ *
+ * Only used if $engine == CRYPT_MODE_MCRYPT
+ *
+ * @link http://www.php.net/mcrypt_module_open
+ * @link http://www.php.net/mcrypt_list_algorithms
+ * @see Crypt_Base::_setupMcrypt()
+ * @var String
+ * @access private
+ */
+ var $cipher_name_mcrypt;
+
+ /**
+ * The default password key_size used by setPassword()
+ *
+ * @see Crypt_Base::setPassword()
+ * @var Integer
+ * @access private
+ */
+ var $password_key_size = 32;
+
+ /**
+ * The default salt used by setPassword()
+ *
+ * @see Crypt_Base::setPassword()
+ * @var String
+ * @access private
+ */
+ var $password_default_salt = 'phpseclib/salt';
+
+ /**
+ * The namespace used by the cipher for its constants.
+ *
+ * ie: AES.php is using CRYPT_AES_MODE_* for its constants
+ * so $const_namespace is AES
+ *
+ * DES.php is using CRYPT_DES_MODE_* for its constants
+ * so $const_namespace is DES... and so on
+ *
+ * All CRYPT_<$const_namespace>_MODE_* are aliases of
+ * the generic CRYPT_MODE_* constants, so both could be used
+ * for each cipher.
+ *
+ * Example:
+ * $aes = new Crypt_AES(CRYPT_AES_MODE_CFB); // $aes will operate in cfb mode
+ * $aes = new Crypt_AES(CRYPT_MODE_CFB); // identical
+ *
+ * @see Crypt_Base::__construct()
+ * @var String
+ * @access private
+ */
+ var $const_namespace;
+
+ /**
+ * The name of the performance-optimized callback function
+ *
+ * Used by encrypt() / decrypt()
+ * only if $engine == CRYPT_MODE_INTERNAL
+ *
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_Base::decrypt()
+ * @see Crypt_Base::_setupInlineCrypt()
+ * @see Crypt_Base::$use_inline_crypt
+ * @var Callback
+ * @access private
+ */
+ var $inline_crypt;
+
+ /**
+ * Holds whether performance-optimized $inline_crypt() can/should be used.
+ *
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_Base::decrypt()
+ * @see Crypt_Base::inline_crypt
+ * @var mixed
+ * @access private
+ */
+ var $use_inline_crypt;
+
+ /**
+ * Default Constructor.
+ *
+ * Determines whether or not the mcrypt extension should be used.
+ *
+ * $mode could be:
+ *
+ * - CRYPT_MODE_ECB
+ *
+ * - CRYPT_MODE_CBC
+ *
+ * - CRYPT_MODE_CTR
+ *
+ * - CRYPT_MODE_CFB
+ *
+ * - CRYPT_MODE_OFB
+ *
+ * (or the alias constants of the chosen cipher, for example for AES: CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC ...)
+ *
+ * If not explicitly set, CRYPT_MODE_CBC will be used.
+ *
+ * @param optional Integer $mode
+ * @access public
+ */
+ function __construct($mode = CRYPT_MODE_CBC)
+ {
+ $const_crypt_mode = 'CRYPT_' . $this->const_namespace . '_MODE';
+
+ // Determining the availibility of mcrypt support for the cipher
+ if (!defined($const_crypt_mode)) {
+ switch (true) {
+ case extension_loaded('mcrypt') && in_array($this->cipher_name_mcrypt, mcrypt_list_algorithms()):
+ define($const_crypt_mode, CRYPT_MODE_MCRYPT);
+ break;
+ default:
+ define($const_crypt_mode, CRYPT_MODE_INTERNAL);
+ }
+ }
+
+ // Determining which internal $engine should be used.
+ // The fastes possible first.
+ switch (true) {
+ case empty($this->cipher_name_mcrypt): // The cipher module has no mcrypt-engine support at all so we force CRYPT_MODE_INTERNAL
+ $this->engine = CRYPT_MODE_INTERNAL;
+ break;
+ case constant($const_crypt_mode) == CRYPT_MODE_MCRYPT:
+ $this->engine = CRYPT_MODE_MCRYPT;
+ break;
+ default:
+ $this->engine = CRYPT_MODE_INTERNAL;
+ }
+
+ // $mode dependent settings
+ switch ($mode) {
+ case CRYPT_MODE_ECB:
+ $this->paddable = true;
+ $this->mode = $mode;
+ break;
+ case CRYPT_MODE_CTR:
+ case CRYPT_MODE_CFB:
+ case CRYPT_MODE_OFB:
+ case CRYPT_MODE_STREAM:
+ $this->mode = $mode;
+ break;
+ case CRYPT_MODE_CBC:
+ default:
+ $this->paddable = true;
+ $this->mode = CRYPT_MODE_CBC;
+ }
+
+ // Determining whether inline crypting can be used by the cipher
+ if ($this->use_inline_crypt !== false && function_exists('create_function')) {
+ $this->use_inline_crypt = true;
+ }
+ }
+
+ /**
+ * Sets the initialization vector. (optional)
+ *
+ * SetIV is not required when CRYPT_MODE_ECB (or ie for AES: CRYPT_AES_MODE_ECB) is being used. If not explicitly set, it'll be assumed
+ * to be all zero's.
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @access public
+ * @param String $iv
+ */
+ function setIV($iv)
+ {
+ if ($this->mode == CRYPT_MODE_ECB) {
+ return;
+ }
+
+ $this->iv = $iv;
+ $this->changed = true;
+ }
+
+ /**
+ * Sets the key.
+ *
+ * The min/max length(s) of the key depends on the cipher which is used.
+ * If the key not fits the length(s) of the cipher it will paded with null bytes
+ * up to the closest valid key length. If the key is more than max length,
+ * we trim the excess bits.
+ *
+ * If the key is not explicitly set, it'll be assumed to be all null bytes.
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @access public
+ * @param String $key
+ */
+ function setKey($key)
+ {
+ $this->key = $key;
+ $this->changed = true;
+ }
+
+ /**
+ * Sets the password.
+ *
+ * Depending on what $method is set to, setPassword()'s (optional) parameters are as follows:
+ * {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2} or pbkdf1:
+ * $hash, $salt, $count, $dkLen
+ *
+ * Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @see Crypt/Hash.php
+ * @param String $password
+ * @param optional String $method
+ * @return Boolean
+ * @access public
+ */
+ function setPassword($password, $method = 'pbkdf2')
+ {
+ $key = '';
+
+ switch ($method) {
+ default: // 'pbkdf2' or 'pbkdf1'
+ $func_args = func_get_args();
+
+ // Hash function
+ $hash = isset($func_args[2]) ? $func_args[2] : 'sha1';
+
+ // WPA and WPA2 use the SSID as the salt
+ $salt = isset($func_args[3]) ? $func_args[3] : $this->password_default_salt;
+
+ // RFC2898#section-4.2 uses 1,000 iterations by default
+ // WPA and WPA2 use 4,096.
+ $count = isset($func_args[4]) ? $func_args[4] : 1000;
+
+ // Keylength
+ if (isset($func_args[5])) {
+ $dkLen = $func_args[5];
+ } else {
+ $dkLen = $method == 'pbkdf1' ? 2 * $this->password_key_size : $this->password_key_size;
+ }
+
+ switch (true) {
+ case $method == 'pbkdf1':
+ $hashObj = new Crypt_Hash();
+ $hashObj->setHash($hash);
+ if ($dkLen > $hashObj->getLength()) {
+ user_error('Derived key too long');
+ return false;
+ }
+ $t = $password . $salt;
+ for ($i = 0; $i < $count; ++$i) {
+ $t = $hashObj->hash($t);
+ }
+ $key = substr($t, 0, $dkLen);
+
+ $this->setKey(substr($key, 0, $dkLen >> 1));
+ $this->setIV(substr($key, $dkLen >> 1));
+
+ return true;
+ // Determining if php[>=5.5.0]'s hash_pbkdf2() function avail- and useable
+ case !function_exists('hash_pbkdf2'):
+ case !function_exists('hash_algos'):
+ case !in_array($hash, hash_algos()):
+ $i = 1;
+ while (strlen($key) < $dkLen) {
+ $hmac = new Crypt_Hash();
+ $hmac->setHash($hash);
+ $hmac->setKey($password);
+ $f = $u = $hmac->hash($salt . pack('N', $i++));
+ for ($j = 2; $j <= $count; ++$j) {
+ $u = $hmac->hash($u);
+ $f^= $u;
+ }
+ $key.= $f;
+ }
+ $key = substr($key, 0, $dkLen);
+ break;
+ default:
+ $key = hash_pbkdf2($hash, $password, $salt, $count, $dkLen, true);
+ }
+ }
+
+ $this->setKey($key);
+
+ return true;
+ }
+
+ /**
+ * Encrypts a message.
+ *
+ * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size. Other cipher
+ * implementations may or may not pad in the same manner. Other common approaches to padding and the reasons why it's
+ * necessary are discussed in the following
+ * URL:
+ *
+ * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
+ *
+ * An alternative to padding is to, separately, send the length of the file. This is what SSH, in fact, does.
+ * strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
+ * length.
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @see Crypt_Base::decrypt()
+ * @access public
+ * @param String $plaintext
+ * @return String $cipertext
+ */
+ function encrypt($plaintext)
+ {
+ if ($this->engine == CRYPT_MODE_MCRYPT) {
+ if ($this->changed) {
+ $this->_setupMcrypt();
+ $this->changed = false;
+ }
+ if ($this->enchanged) {
+ mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
+ $this->enchanged = false;
+ }
+
+ // re: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
+ // using mcrypt's default handing of CFB the above would output two different things. using phpseclib's
+ // rewritten CFB implementation the above outputs the same thing twice.
+ if ($this->mode == CRYPT_MODE_CFB && $this->continuousBuffer) {
+ $block_size = $this->block_size;
+ $iv = &$this->encryptIV;
+ $pos = &$this->enbuffer['pos'];
+ $len = strlen($plaintext);
+ $ciphertext = '';
+ $i = 0;
+ if ($pos) {
+ $orig_pos = $pos;
+ $max = $block_size - $pos;
+ if ($len >= $max) {
+ $i = $max;
+ $len-= $max;
+ $pos = 0;
+ } else {
+ $i = $len;
+ $pos+= $len;
+ $len = 0;
+ }
+ $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+ $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+ $this->enbuffer['enmcrypt_init'] = true;
+ }
+ if ($len >= $block_size) {
+ if ($this->enbuffer['enmcrypt_init'] === false || $len > $this->cfb_init_len) {
+ if ($this->enbuffer['enmcrypt_init'] === true) {
+ mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
+ $this->enbuffer['enmcrypt_init'] = false;
+ }
+ $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % $block_size));
+ $iv = substr($ciphertext, -$block_size);
+ $len%= $block_size;
+ } else {
+ while ($len >= $block_size) {
+ $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, $block_size);
+ $ciphertext.= $iv;
+ $len-= $block_size;
+ $i+= $block_size;
+ }
+ }
+ }
+
+ if ($len) {
+ $iv = mcrypt_generic($this->ecb, $iv);
+ $block = $iv ^ substr($plaintext, -$len);
+ $iv = substr_replace($iv, $block, 0, $len);
+ $ciphertext.= $block;
+ $pos = $len;
+ }
+
+ return $ciphertext;
+ }
+
+ if ($this->paddable) {
+ $plaintext = $this->_pad($plaintext);
+ }
+
+ $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
+
+ if (!$this->continuousBuffer) {
+ mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
+ }
+
+ return $ciphertext;
+ }
+
+ if ($this->changed) {
+ $this->_setup();
+ $this->changed = false;
+ }
+ if ($this->use_inline_crypt) {
+ $inline = $this->inline_crypt;
+ return $inline('encrypt', $this, $plaintext);
+ }
+ if ($this->paddable) {
+ $plaintext = $this->_pad($plaintext);
+ }
+
+ $buffer = &$this->enbuffer;
+ $block_size = $this->block_size;
+ $ciphertext = '';
+ switch ($this->mode) {
+ case CRYPT_MODE_ECB:
+ for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+ $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
+ }
+ break;
+ case CRYPT_MODE_CBC:
+ $xor = $this->encryptIV;
+ for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+ $block = substr($plaintext, $i, $block_size);
+ $block = $this->_encryptBlock($block ^ $xor);
+ $xor = $block;
+ $ciphertext.= $block;
+ }
+ if ($this->continuousBuffer) {
+ $this->encryptIV = $xor;
+ }
+ break;
+ case CRYPT_MODE_CTR:
+ $xor = $this->encryptIV;
+ if (strlen($buffer['encrypted'])) {
+ for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+ $block = substr($plaintext, $i, $block_size);
+ if (strlen($block) > strlen($buffer['encrypted'])) {
+ $buffer['encrypted'].= $this->_encryptBlock($this->_generateXor($xor, $block_size));
+ }
+ $key = $this->_stringShift($buffer['encrypted'], $block_size);
+ $ciphertext.= $block ^ $key;
+ }
+ } else {
+ for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+ $block = substr($plaintext, $i, $block_size);
+ $key = $this->_encryptBlock($this->_generateXor($xor, $block_size));
+ $ciphertext.= $block ^ $key;
+ }
+ }
+ if ($this->continuousBuffer) {
+ $this->encryptIV = $xor;
+ if ($start = strlen($plaintext) % $block_size) {
+ $buffer['encrypted'] = substr($key, $start) . $buffer['encrypted'];
+ }
+ }
+ break;
+ case CRYPT_MODE_CFB:
+ // cfb loosely routines inspired by openssl's:
+ // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+ if ($this->continuousBuffer) {
+ $iv = &$this->encryptIV;
+ $pos = &$buffer['pos'];
+ } else {
+ $iv = $this->encryptIV;
+ $pos = 0;
+ }
+ $len = strlen($plaintext);
+ $i = 0;
+ if ($pos) {
+ $orig_pos = $pos;
+ $max = $block_size - $pos;
+ if ($len >= $max) {
+ $i = $max;
+ $len-= $max;
+ $pos = 0;
+ } else {
+ $i = $len;
+ $pos+= $len;
+ $len = 0;
+ }
+ // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+ $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+ $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+ }
+ while ($len >= $block_size) {
+ $iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
+ $ciphertext.= $iv;
+ $len-= $block_size;
+ $i+= $block_size;
+ }
+ if ($len) {
+ $iv = $this->_encryptBlock($iv);
+ $block = $iv ^ substr($plaintext, $i);
+ $iv = substr_replace($iv, $block, 0, $len);
+ $ciphertext.= $block;
+ $pos = $len;
+ }
+ break;
+ case CRYPT_MODE_OFB:
+ $xor = $this->encryptIV;
+ if (strlen($buffer['xor'])) {
+ for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+ $block = substr($plaintext, $i, $block_size);
+ if (strlen($block) > strlen($buffer['xor'])) {
+ $xor = $this->_encryptBlock($xor);
+ $buffer['xor'].= $xor;
+ }
+ $key = $this->_stringShift($buffer['xor'], $block_size);
+ $ciphertext.= $block ^ $key;
+ }
+ } else {
+ for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+ $xor = $this->_encryptBlock($xor);
+ $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
+ }
+ $key = $xor;
+ }
+ if ($this->continuousBuffer) {
+ $this->encryptIV = $xor;
+ if ($start = strlen($plaintext) % $block_size) {
+ $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+ }
+ }
+ break;
+ case CRYPT_MODE_STREAM:
+ $ciphertext = $this->_encryptBlock($plaintext);
+ break;
+ }
+
+ return $ciphertext;
+ }
+
+ /**
+ * Decrypts a message.
+ *
+ * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
+ * it is.
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @see Crypt_Base::encrypt()
+ * @access public
+ * @param String $ciphertext
+ * @return String $plaintext
+ */
+ function decrypt($ciphertext)
+ {
+ if ($this->engine == CRYPT_MODE_MCRYPT) {
+ $block_size = $this->block_size;
+ if ($this->changed) {
+ $this->_setupMcrypt();
+ $this->changed = false;
+ }
+ if ($this->dechanged) {
+ mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
+ $this->dechanged = false;
+ }
+
+ if ($this->mode == CRYPT_MODE_CFB && $this->continuousBuffer) {
+ $iv = &$this->decryptIV;
+ $pos = &$this->debuffer['pos'];
+ $len = strlen($ciphertext);
+ $plaintext = '';
+ $i = 0;
+ if ($pos) {
+ $orig_pos = $pos;
+ $max = $block_size - $pos;
+ if ($len >= $max) {
+ $i = $max;
+ $len-= $max;
+ $pos = 0;
+ } else {
+ $i = $len;
+ $pos+= $len;
+ $len = 0;
+ }
+ // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+ $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+ $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+ }
+ if ($len >= $block_size) {
+ $cb = substr($ciphertext, $i, $len - $len % $block_size);
+ $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+ $iv = substr($cb, -$block_size);
+ $len%= $block_size;
+ }
+ if ($len) {
+ $iv = mcrypt_generic($this->ecb, $iv);
+ $plaintext.= $iv ^ substr($ciphertext, -$len);
+ $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
+ $pos = $len;
+ }
+
+ return $plaintext;
+ }
+
+ if ($this->paddable) {
+ // we pad with chr(0) since that's what mcrypt_generic does. to quote from {@link http://www.php.net/function.mcrypt-generic}:
+ // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
+ $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($block_size - strlen($ciphertext) % $block_size) % $block_size, chr(0));
+ }
+
+ $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
+
+ if (!$this->continuousBuffer) {
+ mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
+ }
+
+ return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+ }
+
+ if ($this->changed) {
+ $this->_setup();
+ $this->changed = false;
+ }
+ if ($this->use_inline_crypt) {
+ $inline = $this->inline_crypt;
+ return $inline('decrypt', $this, $ciphertext);
+ }
+
+ $block_size = $this->block_size;
+ if ($this->paddable) {
+ // we pad with chr(0) since that's what mcrypt_generic does [...]
+ $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($block_size - strlen($ciphertext) % $block_size) % $block_size, chr(0));
+ }
+
+ $buffer = &$this->debuffer;
+ $plaintext = '';
+ switch ($this->mode) {
+ case CRYPT_MODE_ECB:
+ for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+ $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
+ }
+ break;
+ case CRYPT_MODE_CBC:
+ $xor = $this->decryptIV;
+ for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+ $block = substr($ciphertext, $i, $block_size);
+ $plaintext.= $this->_decryptBlock($block) ^ $xor;
+ $xor = $block;
+ }
+ if ($this->continuousBuffer) {
+ $this->decryptIV = $xor;
+ }
+ break;
+ case CRYPT_MODE_CTR:
+ $xor = $this->decryptIV;
+ if (strlen($buffer['ciphertext'])) {
+ for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+ $block = substr($ciphertext, $i, $block_size);
+ if (strlen($block) > strlen($buffer['ciphertext'])) {
+ $buffer['ciphertext'].= $this->_encryptBlock($this->_generateXor($xor, $block_size));
+ }
+ $key = $this->_stringShift($buffer['ciphertext'], $block_size);
+ $plaintext.= $block ^ $key;
+ }
+ } else {
+ for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+ $block = substr($ciphertext, $i, $block_size);
+ $key = $this->_encryptBlock($this->_generateXor($xor, $block_size));
+ $plaintext.= $block ^ $key;
+ }
+ }
+ if ($this->continuousBuffer) {
+ $this->decryptIV = $xor;
+ if ($start = strlen($ciphertext) % $block_size) {
+ $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+ }
+ }
+ break;
+ case CRYPT_MODE_CFB:
+ if ($this->continuousBuffer) {
+ $iv = &$this->decryptIV;
+ $pos = &$buffer['pos'];
+ } else {
+ $iv = $this->decryptIV;
+ $pos = 0;
+ }
+ $len = strlen($ciphertext);
+ $i = 0;
+ if ($pos) {
+ $orig_pos = $pos;
+ $max = $block_size - $pos;
+ if ($len >= $max) {
+ $i = $max;
+ $len-= $max;
+ $pos = 0;
+ } else {
+ $i = $len;
+ $pos+= $len;
+ $len = 0;
+ }
+ // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+ $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+ $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+ }
+ while ($len >= $block_size) {
+ $iv = $this->_encryptBlock($iv);
+ $cb = substr($ciphertext, $i, $block_size);
+ $plaintext.= $iv ^ $cb;
+ $iv = $cb;
+ $len-= $block_size;
+ $i+= $block_size;
+ }
+ if ($len) {
+ $iv = $this->_encryptBlock($iv);
+ $plaintext.= $iv ^ substr($ciphertext, $i);
+ $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
+ $pos = $len;
+ }
+ break;
+ case CRYPT_MODE_OFB:
+ $xor = $this->decryptIV;
+ if (strlen($buffer['xor'])) {
+ for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+ $block = substr($ciphertext, $i, $block_size);
+ if (strlen($block) > strlen($buffer['xor'])) {
+ $xor = $this->_encryptBlock($xor);
+ $buffer['xor'].= $xor;
+ }
+ $key = $this->_stringShift($buffer['xor'], $block_size);
+ $plaintext.= $block ^ $key;
+ }
+ } else {
+ for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+ $xor = $this->_encryptBlock($xor);
+ $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
+ }
+ $key = $xor;
+ }
+ if ($this->continuousBuffer) {
+ $this->decryptIV = $xor;
+ if ($start = strlen($ciphertext) % $block_size) {
+ $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+ }
+ }
+ break;
+ case CRYPT_MODE_STREAM:
+ $plaintext = $this->_decryptBlock($ciphertext);
+ break;
+ }
+ return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+ }
+
+ /**
+ * Pad "packets".
+ *
+ * Block ciphers working by encrypting between their specified [$this->]block_size at a time
+ * If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
+ * pad the input so that it is of the proper length.
+ *
+ * Padding is enabled by default. Sometimes, however, it is undesirable to pad strings. Such is the case in SSH,
+ * where "packets" are padded with random bytes before being encrypted. Unpad these packets and you risk stripping
+ * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
+ * transmitted separately)
+ *
+ * @see Crypt_Base::disablePadding()
+ * @access public
+ */
+ function enablePadding()
+ {
+ $this->padding = true;
+ }
+
+ /**
+ * Do not pad packets.
+ *
+ * @see Crypt_Base::enablePadding()
+ * @access public
+ */
+ function disablePadding()
+ {
+ $this->padding = false;
+ }
+
+ /**
+ * Treat consecutive "packets" as if they are a continuous buffer.
+ *
+ * Say you have a 32-byte plaintext $plaintext. Using the default behavior, the two following code snippets
+ * will yield different outputs:
+ *
+ *
+ * echo $rijndael->encrypt(substr($plaintext, 0, 16));
+ * echo $rijndael->encrypt(substr($plaintext, 16, 16));
+ *
+ *
+ * echo $rijndael->encrypt($plaintext);
+ *
+ *
+ * The solution is to enable the continuous buffer. Although this will resolve the above discrepancy, it creates
+ * another, as demonstrated with the following:
+ *
+ *
+ * $rijndael->encrypt(substr($plaintext, 0, 16));
+ * echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
+ *
+ *
+ * echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
+ *
+ *
+ * With the continuous buffer disabled, these would yield the same output. With it enabled, they yield different
+ * outputs. The reason is due to the fact that the initialization vector's change after every encryption /
+ * decryption round when the continuous buffer is enabled. When it's disabled, they remain constant.
+ *
+ * Put another way, when the continuous buffer is enabled, the state of the Crypt_*() object changes after each
+ * encryption / decryption round, whereas otherwise, it'd remain constant. For this reason, it's recommended that
+ * continuous buffers not be used. They do offer better security and are, in fact, sometimes required (SSH uses them),
+ * however, they are also less intuitive and more likely to cause you problems.
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @see Crypt_Base::disableContinuousBuffer()
+ * @access public
+ */
+ function enableContinuousBuffer()
+ {
+ if ($this->mode == CRYPT_MODE_ECB) {
+ return;
+ }
+
+ $this->continuousBuffer = true;
+ }
+
+ /**
+ * Treat consecutive packets as if they are a discontinuous buffer.
+ *
+ * The default behavior.
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @see Crypt_Base::enableContinuousBuffer()
+ * @access public
+ */
+ function disableContinuousBuffer()
+ {
+ if ($this->mode == CRYPT_MODE_ECB) {
+ return;
+ }
+ if (!$this->continuousBuffer) {
+ return;
+ }
+
+ $this->continuousBuffer = false;
+ $this->changed = true;
+ }
+
+ /**
+ * Encrypts a block
+ *
+ * Note: Must extend by the child Crypt_* class
+ *
+ * @access private
+ * @param String $in
+ * @return String
+ */
+ function _encryptBlock($in)
+ {
+ user_error((version_compare(PHP_VERSION, '5.0.0', '>=') ? __METHOD__ : __FUNCTION__) . '() must extend by class ' . get_class($this), E_USER_ERROR);
+ }
+
+ /**
+ * Decrypts a block
+ *
+ * Note: Must extend by the child Crypt_* class
+ *
+ * @access private
+ * @param String $in
+ * @return String
+ */
+ function _decryptBlock($in)
+ {
+ user_error((version_compare(PHP_VERSION, '5.0.0', '>=') ? __METHOD__ : __FUNCTION__) . '() must extend by class ' . get_class($this), E_USER_ERROR);
+ }
+
+ /**
+ * Setup the key (expansion)
+ *
+ * Only used if $engine == CRYPT_MODE_INTERNAL
+ *
+ * Note: Must extend by the child Crypt_* class
+ *
+ * @see Crypt_Base::_setup()
+ * @access private
+ */
+ function _setupKey()
+ {
+ user_error((version_compare(PHP_VERSION, '5.0.0', '>=') ? __METHOD__ : __FUNCTION__) . '() must extend by class ' . get_class($this), E_USER_ERROR);
+ }
+
+ /**
+ * Setup the CRYPT_MODE_INTERNAL $engine
+ *
+ * (re)init, if necessary, the internal cipher $engine and flush all $buffers
+ * Used (only) if $engine == CRYPT_MODE_INTERNAL
+ *
+ * _setup() will be called each time if $changed === true
+ * typically this happens when using one or more of following public methods:
+ *
+ * - setKey()
+ *
+ * - setIV()
+ *
+ * - disableContinuousBuffer()
+ *
+ * - First run of encrypt() / decrypt() with no init-settings
+ *
+ * Internally: _setup() is called always before(!) en/decryption.
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @see setKey()
+ * @see setIV()
+ * @see disableContinuousBuffer()
+ * @access private
+ */
+ function _setup()
+ {
+ $this->_clearBuffers();
+ $this->_setupKey();
+
+ if ($this->use_inline_crypt) {
+ $this->_setupInlineCrypt();
+ }
+ }
+
+ /**
+ * Setup the CRYPT_MODE_MCRYPT $engine
+ *
+ * (re)init, if necessary, the (ext)mcrypt resources and flush all $buffers
+ * Used (only) if $engine = CRYPT_MODE_MCRYPT
+ *
+ * _setupMcrypt() will be called each time if $changed === true
+ * typically this happens when using one or more of following public methods:
+ *
+ * - setKey()
+ *
+ * - setIV()
+ *
+ * - disableContinuousBuffer()
+ *
+ * - First run of encrypt() / decrypt()
+ *
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @see setKey()
+ * @see setIV()
+ * @see disableContinuousBuffer()
+ * @access private
+ */
+ function _setupMcrypt()
+ {
+ $this->_clearBuffers();
+ $this->enchanged = $this->dechanged = true;
+
+ if (!isset($this->enmcrypt)) {
+ static $mcrypt_modes = array(
+ CRYPT_MODE_CTR => 'ctr',
+ CRYPT_MODE_ECB => MCRYPT_MODE_ECB,
+ CRYPT_MODE_CBC => MCRYPT_MODE_CBC,
+ CRYPT_MODE_CFB => 'ncfb',
+ CRYPT_MODE_OFB => MCRYPT_MODE_NOFB,
+ CRYPT_MODE_STREAM => MCRYPT_MODE_STREAM,
+ );
+
+ $this->demcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
+ $this->enmcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
+
+ // we need the $ecb mcrypt resource (only) in MODE_CFB with enableContinuousBuffer()
+ // to workaround mcrypt's broken ncfb implementation in buffered mode
+ // see: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
+ if ($this->mode == CRYPT_MODE_CFB) {
+ $this->ecb = mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
+ }
+
+ } // else should mcrypt_generic_deinit be called?
+
+ if ($this->mode == CRYPT_MODE_CFB) {
+ mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size));
+ }
+ }
+
+ /**
+ * Pads a string
+ *
+ * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
+ * $this->block_size - (strlen($text) % $this->block_size) bytes are added, each of which is equal to
+ * chr($this->block_size - (strlen($text) % $this->block_size)
+ *
+ * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
+ * and padding will, hence forth, be enabled.
+ *
+ * @see Crypt_Base::_unpad()
+ * @param String $text
+ * @access private
+ * @return String
+ */
+ function _pad($text)
+ {
+ $length = strlen($text);
+
+ if (!$this->padding) {
+ if ($length % $this->block_size == 0) {
+ return $text;
+ } else {
+ user_error("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size})");
+ $this->padding = true;
+ }
+ }
+
+ $pad = $this->block_size - ($length % $this->block_size);
+
+ return str_pad($text, $length + $pad, chr($pad));
+ }
+
+ /**
+ * Unpads a string.
+ *
+ * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
+ * and false will be returned.
+ *
+ * @see Crypt_Base::_pad()
+ * @param String $text
+ * @access private
+ * @return String
+ */
+ function _unpad($text)
+ {
+ if (!$this->padding) {
+ return $text;
+ }
+
+ $length = ord($text[strlen($text) - 1]);
+
+ if (!$length || $length > $this->block_size) {
+ return false;
+ }
+
+ return substr($text, 0, -$length);
+ }
+
+ /**
+ * Clears internal buffers
+ *
+ * Clearing/resetting the internal buffers is done everytime
+ * after disableContinuousBuffer() or on cipher $engine (re)init
+ * ie after setKey() or setIV()
+ *
+ * Note: Could, but not must, extend by the child Crypt_* class
+ *
+ * @access public
+ */
+ function _clearBuffers()
+ {
+ $this->enbuffer = array('encrypted' => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true);
+ $this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0, 'demcrypt_init' => true);
+
+ // mcrypt's handling of invalid's $iv:
+ // $this->encryptIV = $this->decryptIV = strlen($this->iv) == $this->block_size ? $this->iv : str_repeat("\0", $this->block_size);
+ $this->encryptIV = $this->decryptIV = str_pad(substr($this->iv, 0, $this->block_size), $this->block_size, "\0");
+ }
+
+ /**
+ * String Shift
+ *
+ * Inspired by array_shift
+ *
+ * @param String $string
+ * @param optional Integer $index
+ * @access private
+ * @return String
+ */
+ function _stringShift(&$string, $index = 1)
+ {
+ $substr = substr($string, 0, $index);
+ $string = substr($string, $index);
+ return $substr;
+ }
+
+ /**
+ * Generate CTR XOR encryption key
+ *
+ * Encrypt the output of this and XOR it against the ciphertext / plaintext to get the
+ * plaintext / ciphertext in CTR mode.
+ *
+ * @see Crypt_Base::decrypt()
+ * @see Crypt_Base::encrypt()
+ * @param String $iv
+ * @param Integer $length
+ * @access private
+ * @return String $xor
+ */
+ function _generateXor(&$iv, $length)
+ {
+ $xor = '';
+ $block_size = $this->block_size;
+ $num_blocks = floor(($length + ($block_size - 1)) / $block_size);
+ for ($i = 0; $i < $num_blocks; $i++) {
+ $xor.= $iv;
+ for ($j = 4; $j <= $block_size; $j+= 4) {
+ $temp = substr($iv, -$j, 4);
+ switch ($temp) {
+ case "\xFF\xFF\xFF\xFF":
+ $iv = substr_replace($iv, "\x00\x00\x00\x00", -$j, 4);
+ break;
+ case "\x7F\xFF\xFF\xFF":
+ $iv = substr_replace($iv, "\x80\x00\x00\x00", -$j, 4);
+ break 2;
+ default:
+ extract(unpack('Ncount', $temp));
+ $iv = substr_replace($iv, pack('N', $count + 1), -$j, 4);
+ break 2;
+ }
+ }
+ }
+
+ return $xor;
+ }
+
+ /**
+ * Setup the performance-optimized function for de/encrypt()
+ *
+ * Stores the created (or existing) callback function-name
+ * in $this->inline_crypt
+ *
+ * Internally for phpseclib developers:
+ *
+ * _setupInlineCrypt() would be called only if:
+ *
+ * - $engine == CRYPT_MODE_INTERNAL and
+ *
+ * - $use_inline_crypt === true
+ *
+ * - each time on _setup(), after(!) _setupKey()
+ *
+ *
+ * This ensures that _setupInlineCrypt() has always a
+ * full ready2go initializated internal cipher $engine state
+ * where, for example, the keys allready expanded,
+ * keys/block_size calculated and such.
+ *
+ * It is, each time if called, the responsibility of _setupInlineCrypt():
+ *
+ * - to set $this->inline_crypt to a valid and fully working callback function
+ * as a (faster) replacement for encrypt() / decrypt()
+ *
+ * - NOT to create unlimited callback functions (for memory reasons!)
+ * no matter how often _setupInlineCrypt() would be called. At some
+ * point of amount they must be generic re-useable.
+ *
+ * - the code of _setupInlineCrypt() it self,
+ * and the generated callback code,
+ * must be, in following order:
+ * - 100% safe
+ * - 100% compatible to encrypt()/decrypt()
+ * - using only php5+ features/lang-constructs/php-extensions if
+ * compatibility (down to php4) or fallback is provided
+ * - readable/maintainable/understandable/commented and... not-cryptic-styled-code :-)
+ * - >= 10% faster than encrypt()/decrypt() [which is, by the way,
+ * the reason for the existence of _setupInlineCrypt() :-)]
+ * - memory-nice
+ * - short (as good as possible)
+ *
+ * Note: - _setupInlineCrypt() is using _createInlineCryptFunction() to create the full callback function code.
+ * - In case of using inline crypting, _setupInlineCrypt() must extend by the child Crypt_* class.
+ * - The following variable names are reserved:
+ * - $_* (all variable names prefixed with an underscore)
+ * - $self (object reference to it self. Do not use $this, but $self instead)
+ * - $in (the content of $in has to en/decrypt by the generated code)
+ * - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
+ *
+ *
+ * @see Crypt_Base::_setup()
+ * @see Crypt_Base::_createInlineCryptFunction()
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_Base::decrypt()
+ * @access private
+ */
+ function _setupInlineCrypt()
+ {
+ // If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()
+
+ // If, for any reason, an extending Crypt_Base() Crypt_* class
+ // not using inline crypting then it must be ensured that: $this->use_inline_crypt = false
+ // ie in the class var declaration of $use_inline_crypt in general for the Crypt_* class,
+ // in the constructor at object instance-time
+ // or, if it's runtime-specific, at runtime
+
+ $this->use_inline_crypt = false;
+ }
+
+ /**
+ * Creates the performance-optimized function for en/decrypt()
+ *
+ * Internally for phpseclib developers:
+ *
+ * _createInlineCryptFunction():
+ *
+ * - merge the $cipher_code [setup'ed by _setupInlineCrypt()]
+ * with the current [$this->]mode of operation code
+ *
+ * - create the $inline function, which called by encrypt() / decrypt()
+ * as its replacement to speed up the en/decryption operations.
+ *
+ * - return the name of the created $inline callback function
+ *
+ * - used to speed up en/decryption
+ *
+ *
+ *
+ * The main reason why can speed up things [up to 50%] this way are:
+ *
+ * - using variables more effective then regular.
+ * (ie no use of expensive arrays but integers $k_0, $k_1 ...
+ * or even, for example, the pure $key[] values hardcoded)
+ *
+ * - avoiding 1000's of function calls of ie _encryptBlock()
+ * but inlining the crypt operations.
+ * in the mode of operation for() loop.
+ *
+ * - full loop unroll the (sometimes key-dependent) rounds
+ * avoiding this way ++$i counters and runtime-if's etc...
+ *
+ * The basic code architectur of the generated $inline en/decrypt()
+ * lambda function, in pseudo php, is:
+ *
+ *
+ * +----------------------------------------------------------------------------------------------+
+ * | callback $inline = create_function: |
+ * | lambda_function_0001_crypt_ECB($action, $text) |
+ * | { |
+ * | INSERT PHP CODE OF: |
+ * | $cipher_code['init_crypt']; // general init code. |
+ * | // ie: $sbox'es declarations used for |
+ * | // encrypt and decrypt'ing. |
+ * | |
+ * | switch ($action) { |
+ * | case 'encrypt': |
+ * | INSERT PHP CODE OF: |
+ * | $cipher_code['init_encrypt']; // encrypt sepcific init code. |
+ * | ie: specified $key or $box |
+ * | declarations for encrypt'ing. |
+ * | |
+ * | foreach ($ciphertext) { |
+ * | $in = $block_size of $ciphertext; |
+ * | |
+ * | INSERT PHP CODE OF: |
+ * | $cipher_code['encrypt_block']; // encrypt's (string) $in, which is always: |
+ * | // strlen($in) == $this->block_size |
+ * | // here comes the cipher algorithm in action |
+ * | // for encryption. |
+ * | // $cipher_code['encrypt_block'] has to |
+ * | // encrypt the content of the $in variable |
+ * | |
+ * | $plaintext .= $in; |
+ * | } |
+ * | return $plaintext; |
+ * | |
+ * | case 'decrypt': |
+ * | INSERT PHP CODE OF: |
+ * | $cipher_code['init_decrypt']; // decrypt sepcific init code |
+ * | ie: specified $key or $box |
+ * | declarations for decrypt'ing. |
+ * | foreach ($plaintext) { |
+ * | $in = $block_size of $plaintext; |
+ * | |
+ * | INSERT PHP CODE OF: |
+ * | $cipher_code['decrypt_block']; // decrypt's (string) $in, which is always |
+ * | // strlen($in) == $this->block_size |
+ * | // here comes the cipher algorithm in action |
+ * | // for decryption. |
+ * | // $cipher_code['decrypt_block'] has to |
+ * | // decrypt the content of the $in variable |
+ * | $ciphertext .= $in; |
+ * | } |
+ * | return $ciphertext; |
+ * | } |
+ * | } |
+ * +----------------------------------------------------------------------------------------------+
+ *
+ *
+ * See also the Crypt_*::_setupInlineCrypt()'s for
+ * productive inline $cipher_code's how they works.
+ *
+ * Structure of:
+ *
+ * $cipher_code = array(
+ * 'init_crypt' => (string) '', // optional
+ * 'init_encrypt' => (string) '', // optional
+ * 'init_decrypt' => (string) '', // optional
+ * 'encrypt_block' => (string) '', // required
+ * 'decrypt_block' => (string) '' // required
+ * );
+ *
+ *
+ * @see Crypt_Base::_setupInlineCrypt()
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_Base::decrypt()
+ * @param Array $cipher_code
+ * @access private
+ * @return String (the name of the created callback function)
+ */
+ function _createInlineCryptFunction($cipher_code)
+ {
+ $block_size = $this->block_size;
+
+ // optional
+ $init_crypt = isset($cipher_code['init_crypt']) ? $cipher_code['init_crypt'] : '';
+ $init_encrypt = isset($cipher_code['init_encrypt']) ? $cipher_code['init_encrypt'] : '';
+ $init_decrypt = isset($cipher_code['init_decrypt']) ? $cipher_code['init_decrypt'] : '';
+ // required
+ $encrypt_block = $cipher_code['encrypt_block'];
+ $decrypt_block = $cipher_code['decrypt_block'];
+
+ // Generating mode of operation inline code,
+ // merged with the $cipher_code algorithm
+ // for encrypt- and decryption.
+ switch ($this->mode) {
+ case CRYPT_MODE_ECB:
+ $encrypt = $init_encrypt . '
+ $_ciphertext = "";
+ $_text = $self->_pad($_text);
+ $_plaintext_len = strlen($_text);
+
+ for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+ $in = substr($_text, $_i, '.$block_size.');
+ '.$encrypt_block.'
+ $_ciphertext.= $in;
+ }
+
+ return $_ciphertext;
+ ';
+
+ $decrypt = $init_decrypt . '
+ $_plaintext = "";
+ $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
+ $_ciphertext_len = strlen($_text);
+
+ for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+ $in = substr($_text, $_i, '.$block_size.');
+ '.$decrypt_block.'
+ $_plaintext.= $in;
+ }
+
+ return $self->_unpad($_plaintext);
+ ';
+ break;
+ case CRYPT_MODE_CTR:
+ $encrypt = $init_encrypt . '
+ $_ciphertext = "";
+ $_plaintext_len = strlen($_text);
+ $_xor = $self->encryptIV;
+ $_buffer = &$self->enbuffer;
+
+ if (strlen($_buffer["encrypted"])) {
+ for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+ $_block = substr($_text, $_i, '.$block_size.');
+ if (strlen($_block) > strlen($_buffer["encrypted"])) {
+ $in = $self->_generateXor($_xor, '.$block_size.');
+ '.$encrypt_block.'
+ $_buffer["encrypted"].= $in;
+ }
+ $_key = $self->_stringShift($_buffer["encrypted"], '.$block_size.');
+ $_ciphertext.= $_block ^ $_key;
+ }
+ } else {
+ for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+ $_block = substr($_text, $_i, '.$block_size.');
+ $in = $self->_generateXor($_xor, '.$block_size.');
+ '.$encrypt_block.'
+ $_key = $in;
+ $_ciphertext.= $_block ^ $_key;
+ }
+ }
+ if ($self->continuousBuffer) {
+ $self->encryptIV = $_xor;
+ if ($_start = $_plaintext_len % '.$block_size.') {
+ $_buffer["encrypted"] = substr($_key, $_start) . $_buffer["encrypted"];
+ }
+ }
+
+ return $_ciphertext;
+ ';
+
+ $decrypt = $init_encrypt . '
+ $_plaintext = "";
+ $_ciphertext_len = strlen($_text);
+ $_xor = $self->decryptIV;
+ $_buffer = &$self->debuffer;
+
+ if (strlen($_buffer["ciphertext"])) {
+ for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+ $_block = substr($_text, $_i, '.$block_size.');
+ if (strlen($_block) > strlen($_buffer["ciphertext"])) {
+ $in = $self->_generateXor($_xor, '.$block_size.');
+ '.$encrypt_block.'
+ $_buffer["ciphertext"].= $in;
+ }
+ $_key = $self->_stringShift($_buffer["ciphertext"], '.$block_size.');
+ $_plaintext.= $_block ^ $_key;
+ }
+ } else {
+ for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+ $_block = substr($_text, $_i, '.$block_size.');
+ $in = $self->_generateXor($_xor, '.$block_size.');
+ '.$encrypt_block.'
+ $_key = $in;
+ $_plaintext.= $_block ^ $_key;
+ }
+ }
+ if ($self->continuousBuffer) {
+ $self->decryptIV = $_xor;
+ if ($_start = $_ciphertext_len % '.$block_size.') {
+ $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
+ }
+ }
+
+ return $_plaintext;
+ ';
+ break;
+ case CRYPT_MODE_CFB:
+ $encrypt = $init_encrypt . '
+ $_ciphertext = "";
+ $_buffer = &$self->enbuffer;
+
+ if ($self->continuousBuffer) {
+ $_iv = &$self->encryptIV;
+ $_pos = &$_buffer["pos"];
+ } else {
+ $_iv = $self->encryptIV;
+ $_pos = 0;
+ }
+ $_len = strlen($_text);
+ $_i = 0;
+ if ($_pos) {
+ $_orig_pos = $_pos;
+ $_max = '.$block_size.' - $_pos;
+ if ($_len >= $_max) {
+ $_i = $_max;
+ $_len-= $_max;
+ $_pos = 0;
+ } else {
+ $_i = $_len;
+ $_pos+= $_len;
+ $_len = 0;
+ }
+ $_ciphertext = substr($_iv, $_orig_pos) ^ $_text;
+ $_iv = substr_replace($_iv, $_ciphertext, $_orig_pos, $_i);
+ }
+ while ($_len >= '.$block_size.') {
+ $in = $_iv;
+ '.$encrypt_block.';
+ $_iv = $in ^ substr($_text, $_i, '.$block_size.');
+ $_ciphertext.= $_iv;
+ $_len-= '.$block_size.';
+ $_i+= '.$block_size.';
+ }
+ if ($_len) {
+ $in = $_iv;
+ '.$encrypt_block.'
+ $_iv = $in;
+ $_block = $_iv ^ substr($_text, $_i);
+ $_iv = substr_replace($_iv, $_block, 0, $_len);
+ $_ciphertext.= $_block;
+ $_pos = $_len;
+ }
+ return $_ciphertext;
+ ';
+
+ $decrypt = $init_encrypt . '
+ $_plaintext = "";
+ $_buffer = &$self->debuffer;
+
+ if ($self->continuousBuffer) {
+ $_iv = &$self->decryptIV;
+ $_pos = &$_buffer["pos"];
+ } else {
+ $_iv = $self->decryptIV;
+ $_pos = 0;
+ }
+ $_len = strlen($_text);
+ $_i = 0;
+ if ($_pos) {
+ $_orig_pos = $_pos;
+ $_max = '.$block_size.' - $_pos;
+ if ($_len >= $_max) {
+ $_i = $_max;
+ $_len-= $_max;
+ $_pos = 0;
+ } else {
+ $_i = $_len;
+ $_pos+= $_len;
+ $_len = 0;
+ }
+ $_plaintext = substr($_iv, $_orig_pos) ^ $_text;
+ $_iv = substr_replace($_iv, substr($_text, 0, $_i), $_orig_pos, $_i);
+ }
+ while ($_len >= '.$block_size.') {
+ $in = $_iv;
+ '.$encrypt_block.'
+ $_iv = $in;
+ $cb = substr($_text, $_i, '.$block_size.');
+ $_plaintext.= $_iv ^ $cb;
+ $_iv = $cb;
+ $_len-= '.$block_size.';
+ $_i+= '.$block_size.';
+ }
+ if ($_len) {
+ $in = $_iv;
+ '.$encrypt_block.'
+ $_iv = $in;
+ $_plaintext.= $_iv ^ substr($_text, $_i);
+ $_iv = substr_replace($_iv, substr($_text, $_i), 0, $_len);
+ $_pos = $_len;
+ }
+
+ return $_plaintext;
+ ';
+ break;
+ case CRYPT_MODE_OFB:
+ $encrypt = $init_encrypt . '
+ $_ciphertext = "";
+ $_plaintext_len = strlen($_text);
+ $_xor = $self->encryptIV;
+ $_buffer = &$self->enbuffer;
+
+ if (strlen($_buffer["xor"])) {
+ for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+ $_block = substr($_text, $_i, '.$block_size.');
+ if (strlen($_block) > strlen($_buffer["xor"])) {
+ $in = $_xor;
+ '.$encrypt_block.'
+ $_xor = $in;
+ $_buffer["xor"].= $_xor;
+ }
+ $_key = $self->_stringShift($_buffer["xor"], '.$block_size.');
+ $_ciphertext.= $_block ^ $_key;
+ }
+ } else {
+ for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+ $in = $_xor;
+ '.$encrypt_block.'
+ $_xor = $in;
+ $_ciphertext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
+ }
+ $_key = $_xor;
+ }
+ if ($self->continuousBuffer) {
+ $self->encryptIV = $_xor;
+ if ($_start = $_plaintext_len % '.$block_size.') {
+ $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
+ }
+ }
+ return $_ciphertext;
+ ';
+
+ $decrypt = $init_encrypt . '
+ $_plaintext = "";
+ $_ciphertext_len = strlen($_text);
+ $_xor = $self->decryptIV;
+ $_buffer = &$self->debuffer;
+
+ if (strlen($_buffer["xor"])) {
+ for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+ $_block = substr($_text, $_i, '.$block_size.');
+ if (strlen($_block) > strlen($_buffer["xor"])) {
+ $in = $_xor;
+ '.$encrypt_block.'
+ $_xor = $in;
+ $_buffer["xor"].= $_xor;
+ }
+ $_key = $self->_stringShift($_buffer["xor"], '.$block_size.');
+ $_plaintext.= $_block ^ $_key;
+ }
+ } else {
+ for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+ $in = $_xor;
+ '.$encrypt_block.'
+ $_xor = $in;
+ $_plaintext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
+ }
+ $_key = $_xor;
+ }
+ if ($self->continuousBuffer) {
+ $self->decryptIV = $_xor;
+ if ($_start = $_ciphertext_len % '.$block_size.') {
+ $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
+ }
+ }
+ return $_plaintext;
+ ';
+ break;
+ case CRYPT_MODE_STREAM:
+ $encrypt = $init_encrypt . '
+ $_ciphertext = "";
+ '.$encrypt_block.'
+ return $_ciphertext;
+ ';
+ $decrypt = $init_decrypt . '
+ $_plaintext = "";
+ '.$decrypt_block.'
+ return $_plaintext;
+ ';
+ break;
+ // case CRYPT_MODE_CBC:
+ default:
+ $encrypt = $init_encrypt . '
+ $_ciphertext = "";
+ $_text = $self->_pad($_text);
+ $_plaintext_len = strlen($_text);
+
+ $in = $self->encryptIV;
+
+ for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+ $in = substr($_text, $_i, '.$block_size.') ^ $in;
+ '.$encrypt_block.'
+ $_ciphertext.= $in;
+ }
+
+ if ($self->continuousBuffer) {
+ $self->encryptIV = $in;
+ }
+
+ return $_ciphertext;
+ ';
+
+ $decrypt = $init_decrypt . '
+ $_plaintext = "";
+ $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
+ $_ciphertext_len = strlen($_text);
+
+ $_iv = $self->decryptIV;
+
+ for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+ $in = $_block = substr($_text, $_i, '.$block_size.');
+ '.$decrypt_block.'
+ $_plaintext.= $in ^ $_iv;
+ $_iv = $_block;
+ }
+
+ if ($self->continuousBuffer) {
+ $self->decryptIV = $_iv;
+ }
+
+ return $self->_unpad($_plaintext);
+ ';
+ break;
+ }
+
+ // Create the $inline function and return its name as string. Ready to run!
+ return create_function('$_action, &$self, $_text', $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }');
+ }
+
+ /**
+ * Holds the lambda_functions table (classwide)
+ *
+ * Each name of the lambda function, created from
+ * _setupInlineCrypt() && _createInlineCryptFunction()
+ * is stored, classwide (!), here for reusing.
+ *
+ * The string-based index of $function is a classwide
+ * uniqe value representing, at least, the $mode of
+ * operation (or more... depends of the optimizing level)
+ * for which $mode the lambda function was created.
+ *
+ * @access private
+ * @return &Array
+ */
+ function &_getLambdaFunctions()
+ {
+ static $functions = array();
+ return $functions;
+ }
+}
diff --git a/vendor/phpseclib/Crypt/Blowfish.php b/vendor/phpseclib/Crypt/Blowfish.php
new file mode 100644
index 0000000000..bc3b9dfc80
--- /dev/null
+++ b/vendor/phpseclib/Crypt/Blowfish.php
@@ -0,0 +1,643 @@
+
+ * setKey('12345678901234567890123456789012');
+ *
+ * $plaintext = str_repeat('a', 1024);
+ *
+ * echo $blowfish->decrypt($blowfish->encrypt($plaintext));
+ * ?>
+ *
+ *
+ * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @category Crypt
+ * @package Crypt_Blowfish
+ * @author Jim Wigginton
+ * @author Hans-Juergen Petrich
+ * @copyright MMVII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
+ */
+
+/**
+ * Make sure we have the base loaded
+ */
+class_exists('PHPSecLib\Crypt_Base');
+
+/**#@+
+ * @access public
+ * @see Crypt_Blowfish::encrypt()
+ * @see Crypt_Blowfish::decrypt()
+ */
+/**
+ * Encrypt / decrypt using the Counter mode.
+ *
+ * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+ */
+define('CRYPT_BLOWFISH_MODE_CTR', CRYPT_MODE_CTR);
+/**
+ * Encrypt / decrypt using the Electronic Code Book mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+ */
+define('CRYPT_BLOWFISH_MODE_ECB', CRYPT_MODE_ECB);
+/**
+ * Encrypt / decrypt using the Code Book Chaining mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+ */
+define('CRYPT_BLOWFISH_MODE_CBC', CRYPT_MODE_CBC);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+ */
+define('CRYPT_BLOWFISH_MODE_CFB', CRYPT_MODE_CFB);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+ */
+define('CRYPT_BLOWFISH_MODE_OFB', CRYPT_MODE_OFB);
+/**#@-*/
+
+/**#@+
+ * @access private
+ * @see Crypt_Base::__construct()
+ */
+/**
+ * Toggles the internal implementation
+ */
+define('CRYPT_BLOWFISH_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
+/**
+ * Toggles the mcrypt implementation
+ */
+define('CRYPT_BLOWFISH_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
+/**#@-*/
+
+/**
+ * Pure-PHP implementation of Blowfish.
+ *
+ * @package Crypt_Blowfish
+ * @author Jim Wigginton
+ * @author Hans-Juergen Petrich
+ * @access public
+ */
+class Crypt_Blowfish extends Crypt_Base
+{
+ /**
+ * Block Length of the cipher
+ *
+ * @see Crypt_Base::block_size
+ * @var Integer
+ * @access private
+ */
+ var $block_size = 8;
+
+ /**
+ * The default password key_size used by setPassword()
+ *
+ * @see Crypt_Base::password_key_size
+ * @see Crypt_Base::setPassword()
+ * @var Integer
+ * @access private
+ */
+ var $password_key_size = 56;
+
+ /**
+ * The namespace used by the cipher for its constants.
+ *
+ * @see Crypt_Base::const_namespace
+ * @var String
+ * @access private
+ */
+ var $const_namespace = 'BLOWFISH';
+
+ /**
+ * The mcrypt specific name of the cipher
+ *
+ * @see Crypt_Base::cipher_name_mcrypt
+ * @var String
+ * @access private
+ */
+ var $cipher_name_mcrypt = 'blowfish';
+
+ /**
+ * Optimizing value while CFB-encrypting
+ *
+ * @see Crypt_Base::cfb_init_len
+ * @var Integer
+ * @access private
+ */
+ var $cfb_init_len = 500;
+
+ /**
+ * The fixed subkeys boxes ($sbox0 - $sbox3) with 256 entries each
+ *
+ * S-Box 1
+ *
+ * @access private
+ * @var array
+ */
+ var $sbox0 = array (
+ 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+ 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+ 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+ 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+ 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+ 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+ 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+ 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+ 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+ 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+ 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+ 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+ 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+ 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+ 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+ 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+ 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+ 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+ 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+ 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+ 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+ 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+ 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+ 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+ 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+ 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+ 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+ 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+ 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+ 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+ 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+ 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+ );
+
+ /**
+ * S-Box 1
+ *
+ * @access private
+ * @var array
+ */
+ var $sbox1 = array(
+ 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+ 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+ 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+ 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+ 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+ 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+ 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+ 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+ 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+ 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+ 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+ 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+ 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+ 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+ 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+ 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+ 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+ 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+ 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+ 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+ 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+ 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+ 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+ 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+ 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+ 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+ 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+ 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+ 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+ 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+ 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+ 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+ );
+
+ /**
+ * S-Box 2
+ *
+ * @access private
+ * @var array
+ */
+ var $sbox2 = array(
+ 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+ 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+ 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+ 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+ 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+ 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+ 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+ 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+ 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+ 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+ 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+ 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+ 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+ 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+ 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+ 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+ 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+ 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+ 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+ 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+ 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+ 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+ 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+ 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+ 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+ 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+ 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+ 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+ 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+ 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+ 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+ 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
+ );
+
+ /**
+ * S-Box 3
+ *
+ * @access private
+ * @var array
+ */
+ var $sbox3 = array(
+ 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+ 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+ 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+ 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+ 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+ 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+ 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+ 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+ 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+ 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+ 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+ 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+ 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+ 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+ 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+ 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+ 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+ 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+ 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+ 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+ 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+ 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+ 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+ 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+ 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+ 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+ 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+ 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+ 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+ 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+ 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+ 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+ );
+
+ /**
+ * P-Array consists of 18 32-bit subkeys
+ *
+ * @var array $parray
+ * @access private
+ */
+ var $parray = array(
+ 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0,
+ 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+ 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b
+ );
+
+ /**
+ * The BCTX-working Array
+ *
+ * Holds the expanded key [p] and the key-depended s-boxes [sb]
+ *
+ * @var array $bctx
+ * @access private
+ */
+ var $bctx;
+
+ /**
+ * Holds the last used key
+ *
+ * @var Array
+ * @access private
+ */
+ var $kl;
+
+ /**
+ * Sets the key.
+ *
+ * Keys can be of any length. Blowfish, itself, requires the use of a key between 32 and max. 448-bits long.
+ * If the key is less than 32-bits we NOT fill the key to 32bit but let the key as it is to be compatible
+ * with mcrypt because mcrypt act this way with blowfish key's < 32 bits.
+ *
+ * If the key is more than 448-bits, we trim the excess bits.
+ *
+ * If the key is not explicitly set, or empty, it'll be assumed a 128 bits key to be all null bytes.
+ *
+ * @access public
+ * @see Crypt_Base::setKey()
+ * @param String $key
+ */
+ function setKey($key)
+ {
+ $keylength = strlen($key);
+
+ if (!$keylength) {
+ $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+ } elseif ($keylength > 56) {
+ $key = substr($key, 0, 56);
+ }
+
+ parent::setKey($key);
+ }
+
+ /**
+ * Setup the key (expansion)
+ *
+ * @see Crypt_Base::_setupKey()
+ * @access private
+ */
+ function _setupKey()
+ {
+ if (isset($this->kl['key']) && $this->key === $this->kl['key']) {
+ // already expanded
+ return;
+ }
+ $this->kl = array('key' => $this->key);
+
+ /* key-expanding p[] and S-Box building sb[] */
+ $this->bctx = array(
+ 'p' => array(),
+ 'sb' => array(
+ $this->sbox0,
+ $this->sbox1,
+ $this->sbox2,
+ $this->sbox3
+ )
+ );
+
+ // unpack binary string in unsigned chars
+ $key = array_values(unpack('C*', $this->key));
+ $keyl = count($key);
+ for ($j = 0, $i = 0; $i < 18; ++$i) {
+ // xor P1 with the first 32-bits of the key, xor P2 with the second 32-bits ...
+ for ($data = 0, $k = 0; $k < 4; ++$k) {
+ $data = ($data << 8) | $key[$j];
+ if (++$j >= $keyl) {
+ $j = 0;
+ }
+ }
+ $this->bctx['p'][] = $this->parray[$i] ^ $data;
+ }
+
+ // encrypt the zero-string, replace P1 and P2 with the encrypted data,
+ // encrypt P3 and P4 with the new P1 and P2, do it with all P-array and subkeys
+ $data = "\0\0\0\0\0\0\0\0";
+ for ($i = 0; $i < 18; $i += 2) {
+ list($l, $r) = array_values(unpack('N*', $data = $this->_encryptBlock($data)));
+ $this->bctx['p'][$i ] = $l;
+ $this->bctx['p'][$i + 1] = $r;
+ }
+ for ($i = 0; $i < 4; ++$i) {
+ for ($j = 0; $j < 256; $j += 2) {
+ list($l, $r) = array_values(unpack('N*', $data = $this->_encryptBlock($data)));
+ $this->bctx['sb'][$i][$j ] = $l;
+ $this->bctx['sb'][$i][$j + 1] = $r;
+ }
+ }
+ }
+
+ /**
+ * Encrypts a block
+ *
+ * @access private
+ * @param String $in
+ * @return String
+ */
+ function _encryptBlock($in)
+ {
+ $p = $this->bctx["p"];
+ // extract($this->bctx["sb"], EXTR_PREFIX_ALL, "sb"); // slower
+ $sb_0 = $this->bctx["sb"][0];
+ $sb_1 = $this->bctx["sb"][1];
+ $sb_2 = $this->bctx["sb"][2];
+ $sb_3 = $this->bctx["sb"][3];
+
+ $in = unpack("N*", $in);
+ $l = $in[1];
+ $r = $in[2];
+
+ for ($i = 0; $i < 16; $i+= 2) {
+ $l^= $p[$i];
+ $r^= ($sb_0[$l >> 24 & 0xff] +
+ $sb_1[$l >> 16 & 0xff] ^
+ $sb_2[$l >> 8 & 0xff]) +
+ $sb_3[$l & 0xff];
+
+ $r^= $p[$i + 1];
+ $l^= ($sb_0[$r >> 24 & 0xff] +
+ $sb_1[$r >> 16 & 0xff] ^
+ $sb_2[$r >> 8 & 0xff]) +
+ $sb_3[$r & 0xff];
+ }
+ return pack("N*", $r ^ $p[17], $l ^ $p[16]);
+ }
+
+ /**
+ * Decrypts a block
+ *
+ * @access private
+ * @param String $in
+ * @return String
+ */
+ function _decryptBlock($in)
+ {
+ $p = $this->bctx["p"];
+ $sb_0 = $this->bctx["sb"][0];
+ $sb_1 = $this->bctx["sb"][1];
+ $sb_2 = $this->bctx["sb"][2];
+ $sb_3 = $this->bctx["sb"][3];
+
+ $in = unpack("N*", $in);
+ $l = $in[1];
+ $r = $in[2];
+
+ for ($i = 17; $i > 2; $i-= 2) {
+ $l^= $p[$i];
+ $r^= ($sb_0[$l >> 24 & 0xff] +
+ $sb_1[$l >> 16 & 0xff] ^
+ $sb_2[$l >> 8 & 0xff]) +
+ $sb_3[$l & 0xff];
+
+ $r^= $p[$i - 1];
+ $l^= ($sb_0[$r >> 24 & 0xff] +
+ $sb_1[$r >> 16 & 0xff] ^
+ $sb_2[$r >> 8 & 0xff]) +
+ $sb_3[$r & 0xff];
+ }
+
+ return pack("N*", $r ^ $p[0], $l ^ $p[1]);
+ }
+
+ /**
+ * Setup the performance-optimized function for de/encrypt()
+ *
+ * @see Crypt_Base::_setupInlineCrypt()
+ * @access private
+ */
+ function _setupInlineCrypt()
+ {
+ $lambda_functions =& Crypt_Blowfish::_getLambdaFunctions();
+
+ // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
+ // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
+ $gen_hi_opt_code = (bool)( count($lambda_functions) < 10);
+
+ switch (true) {
+ case $gen_hi_opt_code:
+ $code_hash = md5(str_pad("Crypt_Blowfish, {$this->mode}, ", 32, "\0") . $this->key);
+ break;
+ default:
+ $code_hash = "Crypt_Blowfish, {$this->mode}";
+ }
+
+ if (!isset($lambda_functions[$code_hash])) {
+ switch (true) {
+ case $gen_hi_opt_code:
+ $p = $this->bctx['p'];
+ $init_crypt = '
+ static $sb_0, $sb_1, $sb_2, $sb_3;
+ if (!$sb_0) {
+ $sb_0 = $self->bctx["sb"][0];
+ $sb_1 = $self->bctx["sb"][1];
+ $sb_2 = $self->bctx["sb"][2];
+ $sb_3 = $self->bctx["sb"][3];
+ }
+ ';
+ break;
+ default:
+ $p = array();
+ for ($i = 0; $i < 18; ++$i) {
+ $p[] = '$p_' . $i;
+ }
+ $init_crypt = '
+ list($sb_0, $sb_1, $sb_2, $sb_3) = $self->bctx["sb"];
+ list(' . implode(',', $p) . ') = $self->bctx["p"];
+
+ ';
+ }
+
+ // Generating encrypt code:
+ $encrypt_block = '
+ $in = unpack("N*", $in);
+ $l = $in[1];
+ $r = $in[2];
+ ';
+ for ($i = 0; $i < 16; $i+= 2) {
+ $encrypt_block.= '
+ $l^= ' . $p[$i] . ';
+ $r^= ($sb_0[$l >> 24 & 0xff] +
+ $sb_1[$l >> 16 & 0xff] ^
+ $sb_2[$l >> 8 & 0xff]) +
+ $sb_3[$l & 0xff];
+
+ $r^= ' . $p[$i + 1] . ';
+ $l^= ($sb_0[$r >> 24 & 0xff] +
+ $sb_1[$r >> 16 & 0xff] ^
+ $sb_2[$r >> 8 & 0xff]) +
+ $sb_3[$r & 0xff];
+ ';
+ }
+ $encrypt_block.= '
+ $in = pack("N*",
+ $r ^ ' . $p[17] . ',
+ $l ^ ' . $p[16] . '
+ );
+ ';
+
+ // Generating decrypt code:
+ $decrypt_block = '
+ $in = unpack("N*", $in);
+ $l = $in[1];
+ $r = $in[2];
+ ';
+
+ for ($i = 17; $i > 2; $i-= 2) {
+ $decrypt_block.= '
+ $l^= ' . $p[$i] . ';
+ $r^= ($sb_0[$l >> 24 & 0xff] +
+ $sb_1[$l >> 16 & 0xff] ^
+ $sb_2[$l >> 8 & 0xff]) +
+ $sb_3[$l & 0xff];
+
+ $r^= ' . $p[$i - 1] . ';
+ $l^= ($sb_0[$r >> 24 & 0xff] +
+ $sb_1[$r >> 16 & 0xff] ^
+ $sb_2[$r >> 8 & 0xff]) +
+ $sb_3[$r & 0xff];
+ ';
+ }
+
+ $decrypt_block.= '
+ $in = pack("N*",
+ $r ^ ' . $p[0] . ',
+ $l ^ ' . $p[1] . '
+ );
+ ';
+
+ $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+ array(
+ 'init_crypt' => $init_crypt,
+ 'init_encrypt' => '',
+ 'init_decrypt' => '',
+ 'encrypt_block' => $encrypt_block,
+ 'decrypt_block' => $decrypt_block
+ )
+ );
+ }
+ $this->inline_crypt = $lambda_functions[$code_hash];
+ }
+}
diff --git a/vendor/phpseclib/Crypt/DES.php b/vendor/phpseclib/Crypt/DES.php
index 41f1c25126..a465380c72 100644
--- a/vendor/phpseclib/Crypt/DES.php
+++ b/vendor/phpseclib/Crypt/DES.php
@@ -19,7 +19,7 @@
* Here's a short example of how to use this library:
*
*
- * @copyright MMVII Jim Wigginton
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @version $Id: DES.php,v 1.12 2010/02/09 06:10:26 terrafrost Exp $
- * @link http://phpseclib.sourceforge.net
+ * @category Crypt
+ * @package Crypt_DES
+ * @author Jim Wigginton
+ * @copyright MMVII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
*/
+/**
+ * Make sure we have the base loaded
+ */
+class_exists('PHPSecLib\Crypt_Base');
+
/**#@+
* @access private
- * @see Crypt_DES::_prepareKey()
+ * @see Crypt_DES::_setupKey()
* @see Crypt_DES::_processBlock()
*/
/**
- * Contains array_reverse($keys[CRYPT_DES_DECRYPT])
+ * Contains $keys[CRYPT_DES_ENCRYPT]
*/
define('CRYPT_DES_ENCRYPT', 0);
/**
- * Contains array_reverse($keys[CRYPT_DES_ENCRYPT])
+ * Contains $keys[CRYPT_DES_DECRYPT]
*/
define('CRYPT_DES_DECRYPT', 1);
/**#@-*/
@@ -89,837 +93,628 @@
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
*/
-define('CRYPT_DES_MODE_CTR', -1);
+define('CRYPT_DES_MODE_CTR', CRYPT_MODE_CTR);
/**
* Encrypt / decrypt using the Electronic Code Book mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
*/
-define('CRYPT_DES_MODE_ECB', 1);
+define('CRYPT_DES_MODE_ECB', CRYPT_MODE_ECB);
/**
* Encrypt / decrypt using the Code Book Chaining mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
*/
-define('CRYPT_DES_MODE_CBC', 2);
+define('CRYPT_DES_MODE_CBC', CRYPT_MODE_CBC);
/**
* Encrypt / decrypt using the Cipher Feedback mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
*/
-define('CRYPT_DES_MODE_CFB', 3);
+define('CRYPT_DES_MODE_CFB', CRYPT_MODE_CFB);
/**
* Encrypt / decrypt using the Cipher Feedback mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
*/
-define('CRYPT_DES_MODE_OFB', 4);
+define('CRYPT_DES_MODE_OFB', CRYPT_MODE_OFB);
/**#@-*/
/**#@+
* @access private
- * @see Crypt_DES::Crypt_DES()
+ * @see Crypt_Base::__construct()
*/
/**
* Toggles the internal implementation
*/
-define('CRYPT_DES_MODE_INTERNAL', 1);
+define('CRYPT_DES_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
/**
* Toggles the mcrypt implementation
*/
-define('CRYPT_DES_MODE_MCRYPT', 2);
+define('CRYPT_DES_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
/**#@-*/
/**
* Pure-PHP implementation of DES.
*
+ * @package Crypt_DES
* @author Jim Wigginton
- * @version 0.1.0
* @access public
- * @package Crypt_DES
*/
-class Crypt_DES {
- /**
- * The Key Schedule
- *
- * @see Crypt_DES::setKey()
- * @var Array
- * @access private
- */
- var $keys = "\0\0\0\0\0\0\0\0";
-
+class Crypt_DES extends Crypt_Base
+{
/**
- * The Encryption Mode
+ * Block Length of the cipher
*
- * @see Crypt_DES::Crypt_DES()
+ * @see Crypt_Base::block_size
* @var Integer
* @access private
*/
- var $mode;
+ var $block_size = 8;
/**
- * Continuous Buffer status
+ * The Key
*
- * @see Crypt_DES::enableContinuousBuffer()
- * @var Boolean
+ * @see Crypt_Base::key
+ * @see setKey()
+ * @var String
* @access private
*/
- var $continuousBuffer = false;
+ var $key = "\0\0\0\0\0\0\0\0";
/**
- * Padding status
+ * The default password key_size used by setPassword()
*
- * @see Crypt_DES::enablePadding()
- * @var Boolean
+ * @see Crypt_Base::password_key_size
+ * @see Crypt_Base::setPassword()
+ * @var Integer
* @access private
*/
- var $padding = true;
+ var $password_key_size = 8;
/**
- * The Initialization Vector
+ * The namespace used by the cipher for its constants.
*
- * @see Crypt_DES::setIV()
+ * @see Crypt_Base::const_namespace
* @var String
* @access private
*/
- var $iv = "\0\0\0\0\0\0\0\0";
+ var $const_namespace = 'DES';
/**
- * A "sliding" Initialization Vector
+ * The mcrypt specific name of the cipher
*
- * @see Crypt_DES::enableContinuousBuffer()
+ * @see Crypt_Base::cipher_name_mcrypt
* @var String
* @access private
*/
- var $encryptIV = "\0\0\0\0\0\0\0\0";
+ var $cipher_name_mcrypt = 'des';
/**
- * A "sliding" Initialization Vector
+ * Optimizing value while CFB-encrypting
*
- * @see Crypt_DES::enableContinuousBuffer()
- * @var String
+ * @see Crypt_Base::cfb_init_len
+ * @var Integer
* @access private
*/
- var $decryptIV = "\0\0\0\0\0\0\0\0";
+ var $cfb_init_len = 500;
/**
- * mcrypt resource for encryption
+ * Switch for DES/3DES encryption
*
- * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
- * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+ * Used only if $engine == CRYPT_DES_MODE_INTERNAL
*
- * @see Crypt_DES::encrypt()
- * @var String
+ * @see Crypt_DES::_setupKey()
+ * @see Crypt_DES::_processBlock()
+ * @var Integer
* @access private
*/
- var $enmcrypt;
+ var $des_rounds = 1;
/**
- * mcrypt resource for decryption
+ * max possible size of $key
*
- * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
- * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
- *
- * @see Crypt_DES::decrypt()
+ * @see Crypt_DES::setKey()
* @var String
* @access private
*/
- var $demcrypt;
+ var $key_size_max = 8;
/**
- * Does the enmcrypt resource need to be (re)initialized?
+ * The Key Schedule
*
- * @see Crypt_DES::setKey()
- * @see Crypt_DES::setIV()
- * @var Boolean
+ * @see Crypt_DES::_setupKey()
+ * @var Array
* @access private
*/
- var $enchanged = true;
+ var $keys;
/**
- * Does the demcrypt resource need to be (re)initialized?
+ * Shuffle table.
*
- * @see Crypt_DES::setKey()
- * @see Crypt_DES::setIV()
- * @var Boolean
- * @access private
- */
- var $dechanged = true;
-
- /**
- * Is the mode one that is paddable?
+ * For each byte value index, the entry holds an 8-byte string
+ * with each byte containing all bits in the same state as the
+ * corresponding bit in the index value.
*
- * @see Crypt_DES::Crypt_DES()
- * @var Boolean
+ * @see Crypt_DES::_processBlock()
+ * @see Crypt_DES::_setupKey()
+ * @var Array
* @access private
*/
- var $paddable = false;
+ var $shuffle = array(
+ "\x00\x00\x00\x00\x00\x00\x00\x00", "\x00\x00\x00\x00\x00\x00\x00\xFF",
+ "\x00\x00\x00\x00\x00\x00\xFF\x00", "\x00\x00\x00\x00\x00\x00\xFF\xFF",
+ "\x00\x00\x00\x00\x00\xFF\x00\x00", "\x00\x00\x00\x00\x00\xFF\x00\xFF",
+ "\x00\x00\x00\x00\x00\xFF\xFF\x00", "\x00\x00\x00\x00\x00\xFF\xFF\xFF",
+ "\x00\x00\x00\x00\xFF\x00\x00\x00", "\x00\x00\x00\x00\xFF\x00\x00\xFF",
+ "\x00\x00\x00\x00\xFF\x00\xFF\x00", "\x00\x00\x00\x00\xFF\x00\xFF\xFF",
+ "\x00\x00\x00\x00\xFF\xFF\x00\x00", "\x00\x00\x00\x00\xFF\xFF\x00\xFF",
+ "\x00\x00\x00\x00\xFF\xFF\xFF\x00", "\x00\x00\x00\x00\xFF\xFF\xFF\xFF",
+ "\x00\x00\x00\xFF\x00\x00\x00\x00", "\x00\x00\x00\xFF\x00\x00\x00\xFF",
+ "\x00\x00\x00\xFF\x00\x00\xFF\x00", "\x00\x00\x00\xFF\x00\x00\xFF\xFF",
+ "\x00\x00\x00\xFF\x00\xFF\x00\x00", "\x00\x00\x00\xFF\x00\xFF\x00\xFF",
+ "\x00\x00\x00\xFF\x00\xFF\xFF\x00", "\x00\x00\x00\xFF\x00\xFF\xFF\xFF",
+ "\x00\x00\x00\xFF\xFF\x00\x00\x00", "\x00\x00\x00\xFF\xFF\x00\x00\xFF",
+ "\x00\x00\x00\xFF\xFF\x00\xFF\x00", "\x00\x00\x00\xFF\xFF\x00\xFF\xFF",
+ "\x00\x00\x00\xFF\xFF\xFF\x00\x00", "\x00\x00\x00\xFF\xFF\xFF\x00\xFF",
+ "\x00\x00\x00\xFF\xFF\xFF\xFF\x00", "\x00\x00\x00\xFF\xFF\xFF\xFF\xFF",
+ "\x00\x00\xFF\x00\x00\x00\x00\x00", "\x00\x00\xFF\x00\x00\x00\x00\xFF",
+ "\x00\x00\xFF\x00\x00\x00\xFF\x00", "\x00\x00\xFF\x00\x00\x00\xFF\xFF",
+ "\x00\x00\xFF\x00\x00\xFF\x00\x00", "\x00\x00\xFF\x00\x00\xFF\x00\xFF",
+ "\x00\x00\xFF\x00\x00\xFF\xFF\x00", "\x00\x00\xFF\x00\x00\xFF\xFF\xFF",
+ "\x00\x00\xFF\x00\xFF\x00\x00\x00", "\x00\x00\xFF\x00\xFF\x00\x00\xFF",
+ "\x00\x00\xFF\x00\xFF\x00\xFF\x00", "\x00\x00\xFF\x00\xFF\x00\xFF\xFF",
+ "\x00\x00\xFF\x00\xFF\xFF\x00\x00", "\x00\x00\xFF\x00\xFF\xFF\x00\xFF",
+ "\x00\x00\xFF\x00\xFF\xFF\xFF\x00", "\x00\x00\xFF\x00\xFF\xFF\xFF\xFF",
+ "\x00\x00\xFF\xFF\x00\x00\x00\x00", "\x00\x00\xFF\xFF\x00\x00\x00\xFF",
+ "\x00\x00\xFF\xFF\x00\x00\xFF\x00", "\x00\x00\xFF\xFF\x00\x00\xFF\xFF",
+ "\x00\x00\xFF\xFF\x00\xFF\x00\x00", "\x00\x00\xFF\xFF\x00\xFF\x00\xFF",
+ "\x00\x00\xFF\xFF\x00\xFF\xFF\x00", "\x00\x00\xFF\xFF\x00\xFF\xFF\xFF",
+ "\x00\x00\xFF\xFF\xFF\x00\x00\x00", "\x00\x00\xFF\xFF\xFF\x00\x00\xFF",
+ "\x00\x00\xFF\xFF\xFF\x00\xFF\x00", "\x00\x00\xFF\xFF\xFF\x00\xFF\xFF",
+ "\x00\x00\xFF\xFF\xFF\xFF\x00\x00", "\x00\x00\xFF\xFF\xFF\xFF\x00\xFF",
+ "\x00\x00\xFF\xFF\xFF\xFF\xFF\x00", "\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF",
+ "\x00\xFF\x00\x00\x00\x00\x00\x00", "\x00\xFF\x00\x00\x00\x00\x00\xFF",
+ "\x00\xFF\x00\x00\x00\x00\xFF\x00", "\x00\xFF\x00\x00\x00\x00\xFF\xFF",
+ "\x00\xFF\x00\x00\x00\xFF\x00\x00", "\x00\xFF\x00\x00\x00\xFF\x00\xFF",
+ "\x00\xFF\x00\x00\x00\xFF\xFF\x00", "\x00\xFF\x00\x00\x00\xFF\xFF\xFF",
+ "\x00\xFF\x00\x00\xFF\x00\x00\x00", "\x00\xFF\x00\x00\xFF\x00\x00\xFF",
+ "\x00\xFF\x00\x00\xFF\x00\xFF\x00", "\x00\xFF\x00\x00\xFF\x00\xFF\xFF",
+ "\x00\xFF\x00\x00\xFF\xFF\x00\x00", "\x00\xFF\x00\x00\xFF\xFF\x00\xFF",
+ "\x00\xFF\x00\x00\xFF\xFF\xFF\x00", "\x00\xFF\x00\x00\xFF\xFF\xFF\xFF",
+ "\x00\xFF\x00\xFF\x00\x00\x00\x00", "\x00\xFF\x00\xFF\x00\x00\x00\xFF",
+ "\x00\xFF\x00\xFF\x00\x00\xFF\x00", "\x00\xFF\x00\xFF\x00\x00\xFF\xFF",
+ "\x00\xFF\x00\xFF\x00\xFF\x00\x00", "\x00\xFF\x00\xFF\x00\xFF\x00\xFF",
+ "\x00\xFF\x00\xFF\x00\xFF\xFF\x00", "\x00\xFF\x00\xFF\x00\xFF\xFF\xFF",
+ "\x00\xFF\x00\xFF\xFF\x00\x00\x00", "\x00\xFF\x00\xFF\xFF\x00\x00\xFF",
+ "\x00\xFF\x00\xFF\xFF\x00\xFF\x00", "\x00\xFF\x00\xFF\xFF\x00\xFF\xFF",
+ "\x00\xFF\x00\xFF\xFF\xFF\x00\x00", "\x00\xFF\x00\xFF\xFF\xFF\x00\xFF",
+ "\x00\xFF\x00\xFF\xFF\xFF\xFF\x00", "\x00\xFF\x00\xFF\xFF\xFF\xFF\xFF",
+ "\x00\xFF\xFF\x00\x00\x00\x00\x00", "\x00\xFF\xFF\x00\x00\x00\x00\xFF",
+ "\x00\xFF\xFF\x00\x00\x00\xFF\x00", "\x00\xFF\xFF\x00\x00\x00\xFF\xFF",
+ "\x00\xFF\xFF\x00\x00\xFF\x00\x00", "\x00\xFF\xFF\x00\x00\xFF\x00\xFF",
+ "\x00\xFF\xFF\x00\x00\xFF\xFF\x00", "\x00\xFF\xFF\x00\x00\xFF\xFF\xFF",
+ "\x00\xFF\xFF\x00\xFF\x00\x00\x00", "\x00\xFF\xFF\x00\xFF\x00\x00\xFF",
+ "\x00\xFF\xFF\x00\xFF\x00\xFF\x00", "\x00\xFF\xFF\x00\xFF\x00\xFF\xFF",
+ "\x00\xFF\xFF\x00\xFF\xFF\x00\x00", "\x00\xFF\xFF\x00\xFF\xFF\x00\xFF",
+ "\x00\xFF\xFF\x00\xFF\xFF\xFF\x00", "\x00\xFF\xFF\x00\xFF\xFF\xFF\xFF",
+ "\x00\xFF\xFF\xFF\x00\x00\x00\x00", "\x00\xFF\xFF\xFF\x00\x00\x00\xFF",
+ "\x00\xFF\xFF\xFF\x00\x00\xFF\x00", "\x00\xFF\xFF\xFF\x00\x00\xFF\xFF",
+ "\x00\xFF\xFF\xFF\x00\xFF\x00\x00", "\x00\xFF\xFF\xFF\x00\xFF\x00\xFF",
+ "\x00\xFF\xFF\xFF\x00\xFF\xFF\x00", "\x00\xFF\xFF\xFF\x00\xFF\xFF\xFF",
+ "\x00\xFF\xFF\xFF\xFF\x00\x00\x00", "\x00\xFF\xFF\xFF\xFF\x00\x00\xFF",
+ "\x00\xFF\xFF\xFF\xFF\x00\xFF\x00", "\x00\xFF\xFF\xFF\xFF\x00\xFF\xFF",
+ "\x00\xFF\xFF\xFF\xFF\xFF\x00\x00", "\x00\xFF\xFF\xFF\xFF\xFF\x00\xFF",
+ "\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00", "\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF",
+ "\xFF\x00\x00\x00\x00\x00\x00\x00", "\xFF\x00\x00\x00\x00\x00\x00\xFF",
+ "\xFF\x00\x00\x00\x00\x00\xFF\x00", "\xFF\x00\x00\x00\x00\x00\xFF\xFF",
+ "\xFF\x00\x00\x00\x00\xFF\x00\x00", "\xFF\x00\x00\x00\x00\xFF\x00\xFF",
+ "\xFF\x00\x00\x00\x00\xFF\xFF\x00", "\xFF\x00\x00\x00\x00\xFF\xFF\xFF",
+ "\xFF\x00\x00\x00\xFF\x00\x00\x00", "\xFF\x00\x00\x00\xFF\x00\x00\xFF",
+ "\xFF\x00\x00\x00\xFF\x00\xFF\x00", "\xFF\x00\x00\x00\xFF\x00\xFF\xFF",
+ "\xFF\x00\x00\x00\xFF\xFF\x00\x00", "\xFF\x00\x00\x00\xFF\xFF\x00\xFF",
+ "\xFF\x00\x00\x00\xFF\xFF\xFF\x00", "\xFF\x00\x00\x00\xFF\xFF\xFF\xFF",
+ "\xFF\x00\x00\xFF\x00\x00\x00\x00", "\xFF\x00\x00\xFF\x00\x00\x00\xFF",
+ "\xFF\x00\x00\xFF\x00\x00\xFF\x00", "\xFF\x00\x00\xFF\x00\x00\xFF\xFF",
+ "\xFF\x00\x00\xFF\x00\xFF\x00\x00", "\xFF\x00\x00\xFF\x00\xFF\x00\xFF",
+ "\xFF\x00\x00\xFF\x00\xFF\xFF\x00", "\xFF\x00\x00\xFF\x00\xFF\xFF\xFF",
+ "\xFF\x00\x00\xFF\xFF\x00\x00\x00", "\xFF\x00\x00\xFF\xFF\x00\x00\xFF",
+ "\xFF\x00\x00\xFF\xFF\x00\xFF\x00", "\xFF\x00\x00\xFF\xFF\x00\xFF\xFF",
+ "\xFF\x00\x00\xFF\xFF\xFF\x00\x00", "\xFF\x00\x00\xFF\xFF\xFF\x00\xFF",
+ "\xFF\x00\x00\xFF\xFF\xFF\xFF\x00", "\xFF\x00\x00\xFF\xFF\xFF\xFF\xFF",
+ "\xFF\x00\xFF\x00\x00\x00\x00\x00", "\xFF\x00\xFF\x00\x00\x00\x00\xFF",
+ "\xFF\x00\xFF\x00\x00\x00\xFF\x00", "\xFF\x00\xFF\x00\x00\x00\xFF\xFF",
+ "\xFF\x00\xFF\x00\x00\xFF\x00\x00", "\xFF\x00\xFF\x00\x00\xFF\x00\xFF",
+ "\xFF\x00\xFF\x00\x00\xFF\xFF\x00", "\xFF\x00\xFF\x00\x00\xFF\xFF\xFF",
+ "\xFF\x00\xFF\x00\xFF\x00\x00\x00", "\xFF\x00\xFF\x00\xFF\x00\x00\xFF",
+ "\xFF\x00\xFF\x00\xFF\x00\xFF\x00", "\xFF\x00\xFF\x00\xFF\x00\xFF\xFF",
+ "\xFF\x00\xFF\x00\xFF\xFF\x00\x00", "\xFF\x00\xFF\x00\xFF\xFF\x00\xFF",
+ "\xFF\x00\xFF\x00\xFF\xFF\xFF\x00", "\xFF\x00\xFF\x00\xFF\xFF\xFF\xFF",
+ "\xFF\x00\xFF\xFF\x00\x00\x00\x00", "\xFF\x00\xFF\xFF\x00\x00\x00\xFF",
+ "\xFF\x00\xFF\xFF\x00\x00\xFF\x00", "\xFF\x00\xFF\xFF\x00\x00\xFF\xFF",
+ "\xFF\x00\xFF\xFF\x00\xFF\x00\x00", "\xFF\x00\xFF\xFF\x00\xFF\x00\xFF",
+ "\xFF\x00\xFF\xFF\x00\xFF\xFF\x00", "\xFF\x00\xFF\xFF\x00\xFF\xFF\xFF",
+ "\xFF\x00\xFF\xFF\xFF\x00\x00\x00", "\xFF\x00\xFF\xFF\xFF\x00\x00\xFF",
+ "\xFF\x00\xFF\xFF\xFF\x00\xFF\x00", "\xFF\x00\xFF\xFF\xFF\x00\xFF\xFF",
+ "\xFF\x00\xFF\xFF\xFF\xFF\x00\x00", "\xFF\x00\xFF\xFF\xFF\xFF\x00\xFF",
+ "\xFF\x00\xFF\xFF\xFF\xFF\xFF\x00", "\xFF\x00\xFF\xFF\xFF\xFF\xFF\xFF",
+ "\xFF\xFF\x00\x00\x00\x00\x00\x00", "\xFF\xFF\x00\x00\x00\x00\x00\xFF",
+ "\xFF\xFF\x00\x00\x00\x00\xFF\x00", "\xFF\xFF\x00\x00\x00\x00\xFF\xFF",
+ "\xFF\xFF\x00\x00\x00\xFF\x00\x00", "\xFF\xFF\x00\x00\x00\xFF\x00\xFF",
+ "\xFF\xFF\x00\x00\x00\xFF\xFF\x00", "\xFF\xFF\x00\x00\x00\xFF\xFF\xFF",
+ "\xFF\xFF\x00\x00\xFF\x00\x00\x00", "\xFF\xFF\x00\x00\xFF\x00\x00\xFF",
+ "\xFF\xFF\x00\x00\xFF\x00\xFF\x00", "\xFF\xFF\x00\x00\xFF\x00\xFF\xFF",
+ "\xFF\xFF\x00\x00\xFF\xFF\x00\x00", "\xFF\xFF\x00\x00\xFF\xFF\x00\xFF",
+ "\xFF\xFF\x00\x00\xFF\xFF\xFF\x00", "\xFF\xFF\x00\x00\xFF\xFF\xFF\xFF",
+ "\xFF\xFF\x00\xFF\x00\x00\x00\x00", "\xFF\xFF\x00\xFF\x00\x00\x00\xFF",
+ "\xFF\xFF\x00\xFF\x00\x00\xFF\x00", "\xFF\xFF\x00\xFF\x00\x00\xFF\xFF",
+ "\xFF\xFF\x00\xFF\x00\xFF\x00\x00", "\xFF\xFF\x00\xFF\x00\xFF\x00\xFF",
+ "\xFF\xFF\x00\xFF\x00\xFF\xFF\x00", "\xFF\xFF\x00\xFF\x00\xFF\xFF\xFF",
+ "\xFF\xFF\x00\xFF\xFF\x00\x00\x00", "\xFF\xFF\x00\xFF\xFF\x00\x00\xFF",
+ "\xFF\xFF\x00\xFF\xFF\x00\xFF\x00", "\xFF\xFF\x00\xFF\xFF\x00\xFF\xFF",
+ "\xFF\xFF\x00\xFF\xFF\xFF\x00\x00", "\xFF\xFF\x00\xFF\xFF\xFF\x00\xFF",
+ "\xFF\xFF\x00\xFF\xFF\xFF\xFF\x00", "\xFF\xFF\x00\xFF\xFF\xFF\xFF\xFF",
+ "\xFF\xFF\xFF\x00\x00\x00\x00\x00", "\xFF\xFF\xFF\x00\x00\x00\x00\xFF",
+ "\xFF\xFF\xFF\x00\x00\x00\xFF\x00", "\xFF\xFF\xFF\x00\x00\x00\xFF\xFF",
+ "\xFF\xFF\xFF\x00\x00\xFF\x00\x00", "\xFF\xFF\xFF\x00\x00\xFF\x00\xFF",
+ "\xFF\xFF\xFF\x00\x00\xFF\xFF\x00", "\xFF\xFF\xFF\x00\x00\xFF\xFF\xFF",
+ "\xFF\xFF\xFF\x00\xFF\x00\x00\x00", "\xFF\xFF\xFF\x00\xFF\x00\x00\xFF",
+ "\xFF\xFF\xFF\x00\xFF\x00\xFF\x00", "\xFF\xFF\xFF\x00\xFF\x00\xFF\xFF",
+ "\xFF\xFF\xFF\x00\xFF\xFF\x00\x00", "\xFF\xFF\xFF\x00\xFF\xFF\x00\xFF",
+ "\xFF\xFF\xFF\x00\xFF\xFF\xFF\x00", "\xFF\xFF\xFF\x00\xFF\xFF\xFF\xFF",
+ "\xFF\xFF\xFF\xFF\x00\x00\x00\x00", "\xFF\xFF\xFF\xFF\x00\x00\x00\xFF",
+ "\xFF\xFF\xFF\xFF\x00\x00\xFF\x00", "\xFF\xFF\xFF\xFF\x00\x00\xFF\xFF",
+ "\xFF\xFF\xFF\xFF\x00\xFF\x00\x00", "\xFF\xFF\xFF\xFF\x00\xFF\x00\xFF",
+ "\xFF\xFF\xFF\xFF\x00\xFF\xFF\x00", "\xFF\xFF\xFF\xFF\x00\xFF\xFF\xFF",
+ "\xFF\xFF\xFF\xFF\xFF\x00\x00\x00", "\xFF\xFF\xFF\xFF\xFF\x00\x00\xFF",
+ "\xFF\xFF\xFF\xFF\xFF\x00\xFF\x00", "\xFF\xFF\xFF\xFF\xFF\x00\xFF\xFF",
+ "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00", "\xFF\xFF\xFF\xFF\xFF\xFF\x00\xFF",
+ "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x00", "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
+ );
/**
- * Encryption buffer for CTR, OFB and CFB modes
+ * IP mapping helper table.
*
- * @see Crypt_DES::encrypt()
- * @var String
- * @access private
- */
- var $enbuffer = '';
-
- /**
- * Decryption buffer for CTR, OFB and CFB modes
+ * Indexing this table with each source byte performs the initial bit permutation.
*
- * @see Crypt_DES::decrypt()
- * @var String
+ * @var Array
* @access private
*/
- var $debuffer = '';
+ var $ipmap = array(
+ 0x00, 0x10, 0x01, 0x11, 0x20, 0x30, 0x21, 0x31,
+ 0x02, 0x12, 0x03, 0x13, 0x22, 0x32, 0x23, 0x33,
+ 0x40, 0x50, 0x41, 0x51, 0x60, 0x70, 0x61, 0x71,
+ 0x42, 0x52, 0x43, 0x53, 0x62, 0x72, 0x63, 0x73,
+ 0x04, 0x14, 0x05, 0x15, 0x24, 0x34, 0x25, 0x35,
+ 0x06, 0x16, 0x07, 0x17, 0x26, 0x36, 0x27, 0x37,
+ 0x44, 0x54, 0x45, 0x55, 0x64, 0x74, 0x65, 0x75,
+ 0x46, 0x56, 0x47, 0x57, 0x66, 0x76, 0x67, 0x77,
+ 0x80, 0x90, 0x81, 0x91, 0xA0, 0xB0, 0xA1, 0xB1,
+ 0x82, 0x92, 0x83, 0x93, 0xA2, 0xB2, 0xA3, 0xB3,
+ 0xC0, 0xD0, 0xC1, 0xD1, 0xE0, 0xF0, 0xE1, 0xF1,
+ 0xC2, 0xD2, 0xC3, 0xD3, 0xE2, 0xF2, 0xE3, 0xF3,
+ 0x84, 0x94, 0x85, 0x95, 0xA4, 0xB4, 0xA5, 0xB5,
+ 0x86, 0x96, 0x87, 0x97, 0xA6, 0xB6, 0xA7, 0xB7,
+ 0xC4, 0xD4, 0xC5, 0xD5, 0xE4, 0xF4, 0xE5, 0xF5,
+ 0xC6, 0xD6, 0xC7, 0xD7, 0xE6, 0xF6, 0xE7, 0xF7,
+ 0x08, 0x18, 0x09, 0x19, 0x28, 0x38, 0x29, 0x39,
+ 0x0A, 0x1A, 0x0B, 0x1B, 0x2A, 0x3A, 0x2B, 0x3B,
+ 0x48, 0x58, 0x49, 0x59, 0x68, 0x78, 0x69, 0x79,
+ 0x4A, 0x5A, 0x4B, 0x5B, 0x6A, 0x7A, 0x6B, 0x7B,
+ 0x0C, 0x1C, 0x0D, 0x1D, 0x2C, 0x3C, 0x2D, 0x3D,
+ 0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+ 0x4C, 0x5C, 0x4D, 0x5D, 0x6C, 0x7C, 0x6D, 0x7D,
+ 0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+ 0x88, 0x98, 0x89, 0x99, 0xA8, 0xB8, 0xA9, 0xB9,
+ 0x8A, 0x9A, 0x8B, 0x9B, 0xAA, 0xBA, 0xAB, 0xBB,
+ 0xC8, 0xD8, 0xC9, 0xD9, 0xE8, 0xF8, 0xE9, 0xF9,
+ 0xCA, 0xDA, 0xCB, 0xDB, 0xEA, 0xFA, 0xEB, 0xFB,
+ 0x8C, 0x9C, 0x8D, 0x9D, 0xAC, 0xBC, 0xAD, 0xBD,
+ 0x8E, 0x9E, 0x8F, 0x9F, 0xAE, 0xBE, 0xAF, 0xBF,
+ 0xCC, 0xDC, 0xCD, 0xDD, 0xEC, 0xFC, 0xED, 0xFD,
+ 0xCE, 0xDE, 0xCF, 0xDF, 0xEE, 0xFE, 0xEF, 0xFF
+ );
/**
- * mcrypt resource for CFB mode
+ * Inverse IP mapping helper table.
+ * Indexing this table with a byte value reverses the bit order.
*
- * @see Crypt_DES::encrypt()
- * @see Crypt_DES::decrypt()
- * @var String
+ * @var Array
* @access private
*/
- var $ecb;
+ var $invipmap = array(
+ 0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
+ 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+ 0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
+ 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+ 0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
+ 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+ 0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
+ 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+ 0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
+ 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+ 0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
+ 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+ 0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
+ 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+ 0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
+ 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+ 0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
+ 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+ 0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
+ 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
+ 0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
+ 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+ 0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
+ 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+ 0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
+ 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
+ 0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
+ 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+ 0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
+ 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
+ 0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
+ 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
+ );
/**
- * Default Constructor.
+ * Pre-permuted S-box1
*
- * Determines whether or not the mcrypt extension should be used. $mode should only, at present, be
- * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC. If not explictly set, CRYPT_DES_MODE_CBC will be used.
+ * Each box ($sbox1-$sbox8) has been vectorized, then each value pre-permuted using the
+ * P table: concatenation can then be replaced by exclusive ORs.
*
- * @param optional Integer $mode
- * @return Crypt_DES
- * @access public
+ * @var Array
+ * @access private
*/
- function __construct($mode = CRYPT_MODE_DES_CBC)
- {
- if ( !defined('CRYPT_DES_MODE') ) {
- switch (true) {
- case extension_loaded('mcrypt'):
- // i'd check to see if des was supported, by doing in_array('des', mcrypt_list_algorithms('')),
- // but since that can be changed after the object has been created, there doesn't seem to be
- // a lot of point...
- define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
- break;
- default:
- define('CRYPT_DES_MODE', CRYPT_DES_MODE_INTERNAL);
- }
- }
-
- switch ( CRYPT_DES_MODE ) {
- case CRYPT_DES_MODE_MCRYPT:
- switch ($mode) {
- case CRYPT_DES_MODE_ECB:
- $this->paddable = true;
- $this->mode = MCRYPT_MODE_ECB;
- break;
- case CRYPT_DES_MODE_CTR:
- $this->mode = 'ctr';
- //$this->mode = in_array('ctr', mcrypt_list_modes()) ? 'ctr' : CRYPT_DES_MODE_CTR;
- break;
- case CRYPT_DES_MODE_CFB:
- $this->mode = 'ncfb';
- break;
- case CRYPT_DES_MODE_OFB:
- $this->mode = MCRYPT_MODE_NOFB;
- break;
- case CRYPT_DES_MODE_CBC:
- default:
- $this->paddable = true;
- $this->mode = MCRYPT_MODE_CBC;
- }
-
- break;
- default:
- switch ($mode) {
- case CRYPT_DES_MODE_ECB:
- case CRYPT_DES_MODE_CBC:
- $this->paddable = true;
- $this->mode = $mode;
- break;
- case CRYPT_DES_MODE_CTR:
- case CRYPT_DES_MODE_CFB:
- case CRYPT_DES_MODE_OFB:
- $this->mode = $mode;
- break;
- default:
- $this->paddable = true;
- $this->mode = CRYPT_DES_MODE_CBC;
- }
- }
- }
+ var $sbox1 = array(
+ 0x00808200, 0x00000000, 0x00008000, 0x00808202,
+ 0x00808002, 0x00008202, 0x00000002, 0x00008000,
+ 0x00000200, 0x00808200, 0x00808202, 0x00000200,
+ 0x00800202, 0x00808002, 0x00800000, 0x00000002,
+ 0x00000202, 0x00800200, 0x00800200, 0x00008200,
+ 0x00008200, 0x00808000, 0x00808000, 0x00800202,
+ 0x00008002, 0x00800002, 0x00800002, 0x00008002,
+ 0x00000000, 0x00000202, 0x00008202, 0x00800000,
+ 0x00008000, 0x00808202, 0x00000002, 0x00808000,
+ 0x00808200, 0x00800000, 0x00800000, 0x00000200,
+ 0x00808002, 0x00008000, 0x00008200, 0x00800002,
+ 0x00000200, 0x00000002, 0x00800202, 0x00008202,
+ 0x00808202, 0x00008002, 0x00808000, 0x00800202,
+ 0x00800002, 0x00000202, 0x00008202, 0x00808200,
+ 0x00000202, 0x00800200, 0x00800200, 0x00000000,
+ 0x00008002, 0x00008200, 0x00000000, 0x00808002
+ );
/**
- * Sets the key.
- *
- * Keys can be of any length. DES, itself, uses 64-bit keys (eg. strlen($key) == 8), however, we
- * only use the first eight, if $key has more then eight characters in it, and pad $key with the
- * null byte if it is less then eight characters long.
- *
- * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
- *
- * If the key is not explicitly set, it'll be assumed to be all zero's.
+ * Pre-permuted S-box2
*
- * @access public
- * @param String $key
+ * @var Array
+ * @access private
*/
- function setKey($key)
- {
- $this->keys = ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) ? str_pad(substr($key, 0, 8), 8, chr(0)) : $this->_prepareKey($key);
- $this->changed = true;
- }
+ var $sbox2 = array(
+ 0x40084010, 0x40004000, 0x00004000, 0x00084010,
+ 0x00080000, 0x00000010, 0x40080010, 0x40004010,
+ 0x40000010, 0x40084010, 0x40084000, 0x40000000,
+ 0x40004000, 0x00080000, 0x00000010, 0x40080010,
+ 0x00084000, 0x00080010, 0x40004010, 0x00000000,
+ 0x40000000, 0x00004000, 0x00084010, 0x40080000,
+ 0x00080010, 0x40000010, 0x00000000, 0x00084000,
+ 0x00004010, 0x40084000, 0x40080000, 0x00004010,
+ 0x00000000, 0x00084010, 0x40080010, 0x00080000,
+ 0x40004010, 0x40080000, 0x40084000, 0x00004000,
+ 0x40080000, 0x40004000, 0x00000010, 0x40084010,
+ 0x00084010, 0x00000010, 0x00004000, 0x40000000,
+ 0x00004010, 0x40084000, 0x00080000, 0x40000010,
+ 0x00080010, 0x40004010, 0x40000010, 0x00080010,
+ 0x00084000, 0x00000000, 0x40004000, 0x00004010,
+ 0x40000000, 0x40080010, 0x40084010, 0x00084000
+ );
/**
- * Sets the initialization vector. (optional)
+ * Pre-permuted S-box3
*
- * SetIV is not required when CRYPT_DES_MODE_ECB is being used. If not explictly set, it'll be assumed
- * to be all zero's.
- *
- * @access public
- * @param String $iv
+ * @var Array
+ * @access private
*/
- function setIV($iv)
- {
- $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($iv, 0, 8), 8, chr(0));
- $this->changed = true;
- }
+ var $sbox3 = array(
+ 0x00000104, 0x04010100, 0x00000000, 0x04010004,
+ 0x04000100, 0x00000000, 0x00010104, 0x04000100,
+ 0x00010004, 0x04000004, 0x04000004, 0x00010000,
+ 0x04010104, 0x00010004, 0x04010000, 0x00000104,
+ 0x04000000, 0x00000004, 0x04010100, 0x00000100,
+ 0x00010100, 0x04010000, 0x04010004, 0x00010104,
+ 0x04000104, 0x00010100, 0x00010000, 0x04000104,
+ 0x00000004, 0x04010104, 0x00000100, 0x04000000,
+ 0x04010100, 0x04000000, 0x00010004, 0x00000104,
+ 0x00010000, 0x04010100, 0x04000100, 0x00000000,
+ 0x00000100, 0x00010004, 0x04010104, 0x04000100,
+ 0x04000004, 0x00000100, 0x00000000, 0x04010004,
+ 0x04000104, 0x00010000, 0x04000000, 0x04010104,
+ 0x00000004, 0x00010104, 0x00010100, 0x04000004,
+ 0x04010000, 0x04000104, 0x00000104, 0x04010000,
+ 0x00010104, 0x00000004, 0x04010004, 0x00010100
+ );
/**
- * Generate CTR XOR encryption key
- *
- * Encrypt the output of this and XOR it against the ciphertext / plaintext to get the
- * plaintext / ciphertext in CTR mode.
+ * Pre-permuted S-box4
*
- * @see Crypt_DES::decrypt()
- * @see Crypt_DES::encrypt()
- * @access public
- * @param Integer $length
- * @param String $iv
+ * @var Array
+ * @access private
*/
- function _generate_xor($length, &$iv)
- {
- $xor = '';
- $num_blocks = ($length + 7) >> 3;
- for ($i = 0; $i < $num_blocks; $i++) {
- $xor.= $iv;
- for ($j = 4; $j <= 8; $j+=4) {
- $temp = substr($iv, -$j, 4);
- switch ($temp) {
- case "\xFF\xFF\xFF\xFF":
- $iv = substr_replace($iv, "\x00\x00\x00\x00", -$j, 4);
- break;
- case "\x7F\xFF\xFF\xFF":
- $iv = substr_replace($iv, "\x80\x00\x00\x00", -$j, 4);
- break 2;
- default:
- extract(unpack('Ncount', $temp));
- $iv = substr_replace($iv, pack('N', $count + 1), -$j, 4);
- break 2;
- }
- }
- }
-
- return $xor;
- }
+ var $sbox4 = array(
+ 0x80401000, 0x80001040, 0x80001040, 0x00000040,
+ 0x00401040, 0x80400040, 0x80400000, 0x80001000,
+ 0x00000000, 0x00401000, 0x00401000, 0x80401040,
+ 0x80000040, 0x00000000, 0x00400040, 0x80400000,
+ 0x80000000, 0x00001000, 0x00400000, 0x80401000,
+ 0x00000040, 0x00400000, 0x80001000, 0x00001040,
+ 0x80400040, 0x80000000, 0x00001040, 0x00400040,
+ 0x00001000, 0x00401040, 0x80401040, 0x80000040,
+ 0x00400040, 0x80400000, 0x00401000, 0x80401040,
+ 0x80000040, 0x00000000, 0x00000000, 0x00401000,
+ 0x00001040, 0x00400040, 0x80400040, 0x80000000,
+ 0x80401000, 0x80001040, 0x80001040, 0x00000040,
+ 0x80401040, 0x80000040, 0x80000000, 0x00001000,
+ 0x80400000, 0x80001000, 0x00401040, 0x80400040,
+ 0x80001000, 0x00001040, 0x00400000, 0x80401000,
+ 0x00000040, 0x00400000, 0x00001000, 0x00401040
+ );
/**
- * Encrypts a message.
- *
- * $plaintext will be padded with up to 8 additional bytes. Other DES implementations may or may not pad in the
- * same manner. Other common approaches to padding and the reasons why it's necessary are discussed in the following
- * URL:
- *
- * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
+ * Pre-permuted S-box5
*
- * An alternative to padding is to, separately, send the length of the file. This is what SSH, in fact, does.
- * strlen($plaintext) will still need to be a multiple of 8, however, arbitrary values can be added to make it that
- * length.
- *
- * @see Crypt_DES::decrypt()
- * @access public
- * @param String $plaintext
+ * @var Array
+ * @access private
*/
- function encrypt($plaintext)
- {
- if ($this->paddable) {
- $plaintext = $this->_pad($plaintext);
- }
-
- if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
- if ($this->enchanged) {
- if (!isset($this->enmcrypt)) {
- $this->enmcrypt = mcrypt_module_open(MCRYPT_DES, '', $this->mode, '');
- }
- mcrypt_generic_init($this->enmcrypt, $this->keys, $this->encryptIV);
- if ($this->mode != 'ncfb') {
- $this->enchanged = false;
- }
- }
-
- if ($this->mode != 'ncfb') {
- $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
- } else {
- if ($this->enchanged) {
- $this->ecb = mcrypt_module_open(MCRYPT_DES, '', MCRYPT_MODE_ECB, '');
- mcrypt_generic_init($this->ecb, $this->keys, "\0\0\0\0\0\0\0\0");
- $this->enchanged = false;
- }
-
- if (strlen($this->enbuffer)) {
- $ciphertext = $plaintext ^ substr($this->encryptIV, strlen($this->enbuffer));
- $this->enbuffer.= $ciphertext;
- if (strlen($this->enbuffer) == 8) {
- $this->encryptIV = $this->enbuffer;
- $this->enbuffer = '';
- mcrypt_generic_init($this->enmcrypt, $this->keys, $this->encryptIV);
- }
- $plaintext = substr($plaintext, strlen($ciphertext));
- } else {
- $ciphertext = '';
- }
-
- $last_pos = strlen($plaintext) & 0xFFFFFFF8;
- $ciphertext.= $last_pos ? mcrypt_generic($this->enmcrypt, substr($plaintext, 0, $last_pos)) : '';
-
- if (strlen($plaintext) & 0x7) {
- if (strlen($ciphertext)) {
- $this->encryptIV = substr($ciphertext, -8);
- }
- $this->encryptIV = mcrypt_generic($this->ecb, $this->encryptIV);
- $this->enbuffer = substr($plaintext, $last_pos) ^ $this->encryptIV;
- $ciphertext.= $this->enbuffer;
- }
- }
-
- if (!$this->continuousBuffer) {
- mcrypt_generic_init($this->enmcrypt, $this->keys, $this->encryptIV);
- }
-
- return $ciphertext;
- }
-
- if (!is_array($this->keys)) {
- $this->keys = $this->_prepareKey("\0\0\0\0\0\0\0\0");
- }
-
- $buffer = &$this->enbuffer;
- $continuousBuffer = $this->continuousBuffer;
- $ciphertext = '';
- switch ($this->mode) {
- case CRYPT_DES_MODE_ECB:
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $ciphertext.= $this->_processBlock(substr($plaintext, $i, 8), CRYPT_DES_ENCRYPT);
- }
- break;
- case CRYPT_DES_MODE_CBC:
- $xor = $this->encryptIV;
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $block = substr($plaintext, $i, 8);
- $block = $this->_processBlock($block ^ $xor, CRYPT_DES_ENCRYPT);
- $xor = $block;
- $ciphertext.= $block;
- }
- if ($this->continuousBuffer) {
- $this->encryptIV = $xor;
- }
- break;
- case CRYPT_DES_MODE_CTR:
- $xor = $this->encryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $block = substr($plaintext, $i, 8);
- $buffer.= $this->_processBlock($this->_generate_xor(8, $xor), CRYPT_DES_ENCRYPT);
- $key = $this->_string_shift($buffer, 8);
- $ciphertext.= $block ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $block = substr($plaintext, $i, 8);
- $key = $this->_processBlock($this->_generate_xor(8, $xor), CRYPT_DES_ENCRYPT);
- $ciphertext.= $block ^ $key;
- }
- }
- if ($this->continuousBuffer) {
- $this->encryptIV = $xor;
- if ($start = strlen($plaintext) & 7) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
- break;
- case CRYPT_DES_MODE_CFB:
- if (!empty($buffer['xor'])) {
- $ciphertext = $plaintext ^ $buffer['xor'];
- $iv = $buffer['encrypted'] . $ciphertext;
- $start = strlen($ciphertext);
- $buffer['encrypted'].= $ciphertext;
- $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
- } else {
- $ciphertext = '';
- $iv = $this->encryptIV;
- $start = 0;
- }
-
- for ($i = $start; $i < strlen($plaintext); $i+=8) {
- $block = substr($plaintext, $i, 8);
- $xor = $this->_processBlock($iv, CRYPT_DES_ENCRYPT);
- $iv = $block ^ $xor;
- if ($continuousBuffer && strlen($iv) != 8) {
- $buffer = array(
- 'encrypted' => $iv,
- 'xor' => substr($xor, strlen($iv))
- );
- }
- $ciphertext.= $iv;
- }
-
- if ($this->continuousBuffer) {
- $this->encryptIV = $iv;
- }
- break;
- case CRYPT_DES_MODE_OFB:
- $xor = $this->encryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $buffer.= $xor;
- $key = $this->_string_shift($buffer, 8);
- $ciphertext.= substr($plaintext, $i, 8) ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $ciphertext.= substr($plaintext, $i, 8) ^ $xor;
- }
- $key = $xor;
- }
- if ($this->continuousBuffer) {
- $this->encryptIV = $xor;
- if ($start = strlen($plaintext) & 7) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
- }
-
- return $ciphertext;
- }
+ var $sbox5 = array(
+ 0x00000080, 0x01040080, 0x01040000, 0x21000080,
+ 0x00040000, 0x00000080, 0x20000000, 0x01040000,
+ 0x20040080, 0x00040000, 0x01000080, 0x20040080,
+ 0x21000080, 0x21040000, 0x00040080, 0x20000000,
+ 0x01000000, 0x20040000, 0x20040000, 0x00000000,
+ 0x20000080, 0x21040080, 0x21040080, 0x01000080,
+ 0x21040000, 0x20000080, 0x00000000, 0x21000000,
+ 0x01040080, 0x01000000, 0x21000000, 0x00040080,
+ 0x00040000, 0x21000080, 0x00000080, 0x01000000,
+ 0x20000000, 0x01040000, 0x21000080, 0x20040080,
+ 0x01000080, 0x20000000, 0x21040000, 0x01040080,
+ 0x20040080, 0x00000080, 0x01000000, 0x21040000,
+ 0x21040080, 0x00040080, 0x21000000, 0x21040080,
+ 0x01040000, 0x00000000, 0x20040000, 0x21000000,
+ 0x00040080, 0x01000080, 0x20000080, 0x00040000,
+ 0x00000000, 0x20040000, 0x01040080, 0x20000080
+ );
/**
- * Decrypts a message.
- *
- * If strlen($ciphertext) is not a multiple of 8, null bytes will be added to the end of the string until it is.
+ * Pre-permuted S-box6
*
- * @see Crypt_DES::encrypt()
- * @access public
- * @param String $ciphertext
+ * @var Array
+ * @access private
*/
- function decrypt($ciphertext)
- {
- if ($this->paddable) {
- // we pad with chr(0) since that's what mcrypt_generic does. to quote from http://php.net/function.mcrypt-generic :
- // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
- $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
- }
-
- if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
- if ($this->dechanged) {
- if (!isset($this->demcrypt)) {
- $this->demcrypt = mcrypt_module_open(MCRYPT_DES, '', $this->mode, '');
- }
- mcrypt_generic_init($this->demcrypt, $this->keys, $this->decryptIV);
- if ($this->mode != 'ncfb') {
- $this->dechanged = false;
- }
- }
-
- if ($this->mode != 'ncfb') {
- $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
- } else {
- if ($this->dechanged) {
- $this->ecb = mcrypt_module_open(MCRYPT_DES, '', MCRYPT_MODE_ECB, '');
- mcrypt_generic_init($this->ecb, $this->keys, "\0\0\0\0\0\0\0\0");
- $this->dechanged = false;
- }
-
- if (strlen($this->debuffer)) {
- $plaintext = $ciphertext ^ substr($this->decryptIV, strlen($this->debuffer));
-
- $this->debuffer.= substr($ciphertext, 0, strlen($plaintext));
- if (strlen($this->debuffer) == 8) {
- $this->decryptIV = $this->debuffer;
- $this->debuffer = '';
- mcrypt_generic_init($this->demcrypt, $this->keys, $this->decryptIV);
- }
- $ciphertext = substr($ciphertext, strlen($plaintext));
- } else {
- $plaintext = '';
- }
-
- $last_pos = strlen($ciphertext) & 0xFFFFFFF8;
- $plaintext.= $last_pos ? mdecrypt_generic($this->demcrypt, substr($ciphertext, 0, $last_pos)) : '';
-
- if (strlen($ciphertext) & 0x7) {
- if (strlen($plaintext)) {
- $this->decryptIV = substr($ciphertext, $last_pos - 8, 8);
- }
- $this->decryptIV = mcrypt_generic($this->ecb, $this->decryptIV);
- $this->debuffer = substr($ciphertext, $last_pos);
- $plaintext.= $this->debuffer ^ $this->decryptIV;
- }
-
- return $plaintext;
- }
-
- if (!$this->continuousBuffer) {
- mcrypt_generic_init($this->demcrypt, $this->keys, $this->decryptIV);
- }
-
- return $this->mode != 'ctr' ? $this->_unpad($plaintext) : $plaintext;
- }
-
- if (!is_array($this->keys)) {
- $this->keys = $this->_prepareKey("\0\0\0\0\0\0\0\0");
- }
-
- $buffer = &$this->debuffer;
- $continuousBuffer = $this->continuousBuffer;
- $plaintext = '';
- switch ($this->mode) {
- case CRYPT_DES_MODE_ECB:
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $plaintext.= $this->_processBlock(substr($ciphertext, $i, 8), CRYPT_DES_DECRYPT);
- }
- break;
- case CRYPT_DES_MODE_CBC:
- $xor = $this->decryptIV;
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $block = substr($ciphertext, $i, 8);
- $plaintext.= $this->_processBlock($block, CRYPT_DES_DECRYPT) ^ $xor;
- $xor = $block;
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $xor;
- }
- break;
- case CRYPT_DES_MODE_CTR:
- $xor = $this->decryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $block = substr($ciphertext, $i, 8);
- $buffer.= $this->_processBlock($this->_generate_xor(8, $xor), CRYPT_DES_ENCRYPT);
- $key = $this->_string_shift($buffer, 8);
- $plaintext.= $block ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $block = substr($ciphertext, $i, 8);
- $key = $this->_processBlock($this->_generate_xor(8, $xor), CRYPT_DES_ENCRYPT);
- $plaintext.= $block ^ $key;
- }
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $xor;
- if ($start = strlen($ciphertext) % 8) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
- break;
- case CRYPT_DES_MODE_CFB:
- if (!empty($buffer['ciphertext'])) {
- $plaintext = $ciphertext ^ substr($this->decryptIV, strlen($buffer['ciphertext']));
- $buffer['ciphertext'].= substr($ciphertext, 0, strlen($plaintext));
- if (strlen($buffer['ciphertext']) == 8) {
- $xor = $this->_processBlock($buffer['ciphertext'], CRYPT_DES_ENCRYPT);
- $buffer['ciphertext'] = '';
- }
- $start = strlen($plaintext);
- $block = $this->decryptIV;
- } else {
- $plaintext = '';
- $xor = $this->_processBlock($this->decryptIV, CRYPT_DES_ENCRYPT);
- $start = 0;
- }
-
- for ($i = $start; $i < strlen($ciphertext); $i+=8) {
- $block = substr($ciphertext, $i, 8);
- $plaintext.= $block ^ $xor;
- if ($continuousBuffer && strlen($block) != 8) {
- $buffer['ciphertext'].= $block;
- $block = $xor;
- } else if (strlen($block) == 8) {
- $xor = $this->_processBlock($block, CRYPT_DES_ENCRYPT);
- }
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $block;
- }
- break;
- case CRYPT_DES_MODE_OFB:
- $xor = $this->decryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $buffer.= $xor;
- $key = $this->_string_shift($buffer, 8);
- $plaintext.= substr($ciphertext, $i, 8) ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $xor = $this->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $plaintext.= substr($ciphertext, $i, 8) ^ $xor;
- }
- $key = $xor;
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $xor;
- if ($start = strlen($ciphertext) % 8) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
- }
-
- return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
- }
+ var $sbox6 = array(
+ 0x10000008, 0x10200000, 0x00002000, 0x10202008,
+ 0x10200000, 0x00000008, 0x10202008, 0x00200000,
+ 0x10002000, 0x00202008, 0x00200000, 0x10000008,
+ 0x00200008, 0x10002000, 0x10000000, 0x00002008,
+ 0x00000000, 0x00200008, 0x10002008, 0x00002000,
+ 0x00202000, 0x10002008, 0x00000008, 0x10200008,
+ 0x10200008, 0x00000000, 0x00202008, 0x10202000,
+ 0x00002008, 0x00202000, 0x10202000, 0x10000000,
+ 0x10002000, 0x00000008, 0x10200008, 0x00202000,
+ 0x10202008, 0x00200000, 0x00002008, 0x10000008,
+ 0x00200000, 0x10002000, 0x10000000, 0x00002008,
+ 0x10000008, 0x10202008, 0x00202000, 0x10200000,
+ 0x00202008, 0x10202000, 0x00000000, 0x10200008,
+ 0x00000008, 0x00002000, 0x10200000, 0x00202008,
+ 0x00002000, 0x00200008, 0x10002008, 0x00000000,
+ 0x10202000, 0x10000000, 0x00200008, 0x10002008
+ );
/**
- * Treat consecutive "packets" as if they are a continuous buffer.
- *
- * Say you have a 16-byte plaintext $plaintext. Using the default behavior, the two following code snippets
- * will yield different outputs:
+ * Pre-permuted S-box7
*
- *
- * echo $des->encrypt(substr($plaintext, 0, 8));
- * echo $des->encrypt(substr($plaintext, 8, 8));
- *
- *
- * echo $des->encrypt($plaintext);
- *
- *
- * The solution is to enable the continuous buffer. Although this will resolve the above discrepancy, it creates
- * another, as demonstrated with the following:
- *
- *
- * $des->encrypt(substr($plaintext, 0, 8));
- * echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
- *
- *
- * echo $des->decrypt($des->encrypt(substr($plaintext, 8, 8)));
- *
- *
- * With the continuous buffer disabled, these would yield the same output. With it enabled, they yield different
- * outputs. The reason is due to the fact that the initialization vector's change after every encryption /
- * decryption round when the continuous buffer is enabled. When it's disabled, they remain constant.
- *
- * Put another way, when the continuous buffer is enabled, the state of the Crypt_DES() object changes after each
- * encryption / decryption round, whereas otherwise, it'd remain constant. For this reason, it's recommended that
- * continuous buffers not be used. They do offer better security and are, in fact, sometimes required (SSH uses them),
- * however, they are also less intuitive and more likely to cause you problems.
- *
- * @see Crypt_DES::disableContinuousBuffer()
- * @access public
+ * @var Array
+ * @access private
*/
- function enableContinuousBuffer()
- {
- $this->continuousBuffer = true;
- }
+ var $sbox7 = array(
+ 0x00100000, 0x02100001, 0x02000401, 0x00000000,
+ 0x00000400, 0x02000401, 0x00100401, 0x02100400,
+ 0x02100401, 0x00100000, 0x00000000, 0x02000001,
+ 0x00000001, 0x02000000, 0x02100001, 0x00000401,
+ 0x02000400, 0x00100401, 0x00100001, 0x02000400,
+ 0x02000001, 0x02100000, 0x02100400, 0x00100001,
+ 0x02100000, 0x00000400, 0x00000401, 0x02100401,
+ 0x00100400, 0x00000001, 0x02000000, 0x00100400,
+ 0x02000000, 0x00100400, 0x00100000, 0x02000401,
+ 0x02000401, 0x02100001, 0x02100001, 0x00000001,
+ 0x00100001, 0x02000000, 0x02000400, 0x00100000,
+ 0x02100400, 0x00000401, 0x00100401, 0x02100400,
+ 0x00000401, 0x02000001, 0x02100401, 0x02100000,
+ 0x00100400, 0x00000000, 0x00000001, 0x02100401,
+ 0x00000000, 0x00100401, 0x02100000, 0x00000400,
+ 0x02000001, 0x02000400, 0x00000400, 0x00100001
+ );
/**
- * Treat consecutive packets as if they are a discontinuous buffer.
+ * Pre-permuted S-box8
*
- * The default behavior.
- *
- * @see Crypt_DES::enableContinuousBuffer()
- * @access public
+ * @var Array
+ * @access private
*/
- function disableContinuousBuffer()
- {
- $this->continuousBuffer = false;
- $this->encryptIV = $this->iv;
- $this->decryptIV = $this->iv;
- }
+ var $sbox8 = array(
+ 0x08000820, 0x00000800, 0x00020000, 0x08020820,
+ 0x08000000, 0x08000820, 0x00000020, 0x08000000,
+ 0x00020020, 0x08020000, 0x08020820, 0x00020800,
+ 0x08020800, 0x00020820, 0x00000800, 0x00000020,
+ 0x08020000, 0x08000020, 0x08000800, 0x00000820,
+ 0x00020800, 0x00020020, 0x08020020, 0x08020800,
+ 0x00000820, 0x00000000, 0x00000000, 0x08020020,
+ 0x08000020, 0x08000800, 0x00020820, 0x00020000,
+ 0x00020820, 0x00020000, 0x08020800, 0x00000800,
+ 0x00000020, 0x08020020, 0x00000800, 0x00020820,
+ 0x08000800, 0x00000020, 0x08000020, 0x08020000,
+ 0x08020020, 0x08000000, 0x00020000, 0x08000820,
+ 0x00000000, 0x08020820, 0x00020020, 0x08000020,
+ 0x08020000, 0x08000800, 0x08000820, 0x00000000,
+ 0x08020820, 0x00020800, 0x00020800, 0x00000820,
+ 0x00000820, 0x00020020, 0x08000000, 0x08020800
+ );
/**
- * Pad "packets".
+ * Sets the key.
*
- * DES works by encrypting eight bytes at a time. If you ever need to encrypt or decrypt something that's not
- * a multiple of eight, it becomes necessary to pad the input so that it's length is a multiple of eight.
+ * Keys can be of any length. DES, itself, uses 64-bit keys (eg. strlen($key) == 8), however, we
+ * only use the first eight, if $key has more then eight characters in it, and pad $key with the
+ * null byte if it is less then eight characters long.
*
- * Padding is enabled by default. Sometimes, however, it is undesirable to pad strings. Such is the case in SSH1,
- * where "packets" are padded with random bytes before being encrypted. Unpad these packets and you risk stripping
- * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
- * transmitted separately)
+ * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
*
- * @see Crypt_DES::disablePadding()
- * @access public
- */
- function enablePadding()
- {
- $this->padding = true;
- }
-
- /**
- * Do not pad packets.
+ * If the key is not explicitly set, it'll be assumed to be all zero's.
*
- * @see Crypt_DES::enablePadding()
+ * @see Crypt_Base::setKey()
* @access public
+ * @param String $key
*/
- function disablePadding()
+ function setKey($key)
{
- $this->padding = false;
+ // We check/cut here only up to max length of the key.
+ // Key padding to the proper length will be done in _setupKey()
+ if (strlen($key) > $this->key_size_max) {
+ $key = substr($key, 0, $this->key_size_max);
+ }
+
+ // Sets the key
+ parent::setKey($key);
}
/**
- * Pads a string
- *
- * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize (8).
- * 8 - (strlen($text) & 7) bytes are added, each of which is equal to chr(8 - (strlen($text) & 7)
- *
- * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
- * and padding will, hence forth, be enabled.
+ * Encrypts a block
*
- * @see Crypt_DES::_unpad()
+ * @see Crypt_Base::_encryptBlock()
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_DES::encrypt()
* @access private
+ * @param String $in
+ * @return String
*/
- function _pad($text)
+ function _encryptBlock($in)
{
- $length = strlen($text);
-
- if (!$this->padding) {
- if (($length & 7) == 0) {
- return $text;
- } else {
- user_error("The plaintext's length ($length) is not a multiple of the block size (8)", E_USER_NOTICE);
- $this->padding = true;
- }
- }
-
- $pad = 8 - ($length & 7);
- return str_pad($text, $length + $pad, chr($pad));
+ return $this->_processBlock($in, CRYPT_DES_ENCRYPT);
}
/**
- * Unpads a string
- *
- * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
- * and false will be returned.
+ * Decrypts a block
*
- * @see Crypt_DES::_pad()
+ * @see Crypt_Base::_decryptBlock()
+ * @see Crypt_Base::decrypt()
+ * @see Crypt_DES::decrypt()
* @access private
+ * @param String $in
+ * @return String
*/
- function _unpad($text)
+ function _decryptBlock($in)
{
- if (!$this->padding) {
- return $text;
- }
-
- $length = ord($text[strlen($text) - 1]);
-
- if (!$length || $length > 8) {
- return false;
- }
-
- return substr($text, 0, -$length);
+ return $this->_processBlock($in, CRYPT_DES_DECRYPT);
}
/**
@@ -929,6 +724,8 @@ function _unpad($text)
* {@link http://en.wikipedia.org/wiki/Image:Feistel.png Feistel.png} to get a general
* idea of what this function does.
*
+ * @see Crypt_DES::_encryptBlock()
+ * @see Crypt_DES::_decryptBlock()
* @access private
* @param String $block
* @param Integer $mode
@@ -936,312 +733,773 @@ function _unpad($text)
*/
function _processBlock($block, $mode)
{
- // s-boxes. in the official DES docs, they're described as being matrices that
- // one accesses by using the first and last bits to determine the row and the
- // middle four bits to determine the column. in this implementation, they've
- // been converted to vectors
- static $sbox = array(
- array(
- 14, 0, 4, 15, 13, 7, 1, 4, 2, 14, 15, 2, 11, 13, 8, 1,
- 3, 10 ,10, 6, 6, 12, 12, 11, 5, 9, 9, 5, 0, 3, 7, 8,
- 4, 15, 1, 12, 14, 8, 8, 2, 13, 4, 6, 9, 2, 1, 11, 7,
- 15, 5, 12, 11, 9, 3, 7, 14, 3, 10, 10, 0, 5, 6, 0, 13
- ),
- array(
- 15, 3, 1, 13, 8, 4, 14, 7, 6, 15, 11, 2, 3, 8, 4, 14,
- 9, 12, 7, 0, 2, 1, 13, 10, 12, 6, 0, 9, 5, 11, 10, 5,
- 0, 13, 14, 8, 7, 10, 11, 1, 10, 3, 4, 15, 13, 4, 1, 2,
- 5, 11, 8, 6, 12, 7, 6, 12, 9, 0, 3, 5, 2, 14, 15, 9
- ),
- array(
- 10, 13, 0, 7, 9, 0, 14, 9, 6, 3, 3, 4, 15, 6, 5, 10,
- 1, 2, 13, 8, 12, 5, 7, 14, 11, 12, 4, 11, 2, 15, 8, 1,
- 13, 1, 6, 10, 4, 13, 9, 0, 8, 6, 15, 9, 3, 8, 0, 7,
- 11, 4, 1, 15, 2, 14, 12, 3, 5, 11, 10, 5, 14, 2, 7, 12
- ),
- array(
- 7, 13, 13, 8, 14, 11, 3, 5, 0, 6, 6, 15, 9, 0, 10, 3,
- 1, 4, 2, 7, 8, 2, 5, 12, 11, 1, 12, 10, 4, 14, 15, 9,
- 10, 3, 6, 15, 9, 0, 0, 6, 12, 10, 11, 1, 7, 13, 13, 8,
- 15, 9, 1, 4, 3, 5, 14, 11, 5, 12, 2, 7, 8, 2, 4, 14
- ),
- array(
- 2, 14, 12, 11, 4, 2, 1, 12, 7, 4, 10, 7, 11, 13, 6, 1,
- 8, 5, 5, 0, 3, 15, 15, 10, 13, 3, 0, 9, 14, 8, 9, 6,
- 4, 11, 2, 8, 1, 12, 11, 7, 10, 1, 13, 14, 7, 2, 8, 13,
- 15, 6, 9, 15, 12, 0, 5, 9, 6, 10, 3, 4, 0, 5, 14, 3
- ),
- array(
- 12, 10, 1, 15, 10, 4, 15, 2, 9, 7, 2, 12, 6, 9, 8, 5,
- 0, 6, 13, 1, 3, 13, 4, 14, 14, 0, 7, 11, 5, 3, 11, 8,
- 9, 4, 14, 3, 15, 2, 5, 12, 2, 9, 8, 5, 12, 15, 3, 10,
- 7, 11, 0, 14, 4, 1, 10, 7, 1, 6, 13, 0, 11, 8, 6, 13
- ),
- array(
- 4, 13, 11, 0, 2, 11, 14, 7, 15, 4, 0, 9, 8, 1, 13, 10,
- 3, 14, 12, 3, 9, 5, 7, 12, 5, 2, 10, 15, 6, 8, 1, 6,
- 1, 6, 4, 11, 11, 13, 13, 8, 12, 1, 3, 4, 7, 10, 14, 7,
- 10, 9, 15, 5, 6, 0, 8, 15, 0, 14, 5, 2, 9, 3, 2, 12
- ),
- array(
- 13, 1, 2, 15, 8, 13, 4, 8, 6, 10, 15, 3, 11, 7, 1, 4,
- 10, 12, 9, 5, 3, 6, 14, 11, 5, 0, 0, 14, 12, 9, 7, 2,
- 7, 2, 11, 1, 4, 14, 1, 7, 9, 4, 12, 10, 14, 8, 2, 13,
- 0, 15, 6, 12, 10, 9, 13, 0, 15, 3, 3, 5, 5, 6, 8, 11
- )
- );
-
- $keys = $this->keys;
-
- $temp = unpack('Na/Nb', $block);
- $block = array($temp['a'], $temp['b']);
-
- // because php does arithmetic right shifts, if the most significant bits are set, right
- // shifting those into the correct position will add 1's - not 0's. this will intefere
- // with the | operation unless a second & is done. so we isolate these bits and left shift
- // them into place. we then & each block with 0x7FFFFFFF to prevennt 1's from being added
- // for any other shifts.
- $msb = array(
- ($block[0] >> 31) & 1,
- ($block[1] >> 31) & 1
- );
- $block[0] &= 0x7FFFFFFF;
- $block[1] &= 0x7FFFFFFF;
-
- // we isolate the appropriate bit in the appropriate integer and shift as appropriate. in
- // some cases, there are going to be multiple bits in the same integer that need to be shifted
- // in the same way. we combine those into one shift operation.
- $block = array(
- (($block[1] & 0x00000040) << 25) | (($block[1] & 0x00004000) << 16) |
- (($block[1] & 0x00400001) << 7) | (($block[1] & 0x40000100) >> 2) |
- (($block[0] & 0x00000040) << 21) | (($block[0] & 0x00004000) << 12) |
- (($block[0] & 0x00400001) << 3) | (($block[0] & 0x40000100) >> 6) |
- (($block[1] & 0x00000010) << 19) | (($block[1] & 0x00001000) << 10) |
- (($block[1] & 0x00100000) << 1) | (($block[1] & 0x10000000) >> 8) |
- (($block[0] & 0x00000010) << 15) | (($block[0] & 0x00001000) << 6) |
- (($block[0] & 0x00100000) >> 3) | (($block[0] & 0x10000000) >> 12) |
- (($block[1] & 0x00000004) << 13) | (($block[1] & 0x00000400) << 4) |
- (($block[1] & 0x00040000) >> 5) | (($block[1] & 0x04000000) >> 14) |
- (($block[0] & 0x00000004) << 9) | ( $block[0] & 0x00000400 ) |
- (($block[0] & 0x00040000) >> 9) | (($block[0] & 0x04000000) >> 18) |
- (($block[1] & 0x00010000) >> 11) | (($block[1] & 0x01000000) >> 20) |
- (($block[0] & 0x00010000) >> 15) | (($block[0] & 0x01000000) >> 24)
- ,
- (($block[1] & 0x00000080) << 24) | (($block[1] & 0x00008000) << 15) |
- (($block[1] & 0x00800002) << 6) | (($block[0] & 0x00000080) << 20) |
- (($block[0] & 0x00008000) << 11) | (($block[0] & 0x00800002) << 2) |
- (($block[1] & 0x00000020) << 18) | (($block[1] & 0x00002000) << 9) |
- ( $block[1] & 0x00200000 ) | (($block[1] & 0x20000000) >> 9) |
- (($block[0] & 0x00000020) << 14) | (($block[0] & 0x00002000) << 5) |
- (($block[0] & 0x00200000) >> 4) | (($block[0] & 0x20000000) >> 13) |
- (($block[1] & 0x00000008) << 12) | (($block[1] & 0x00000800) << 3) |
- (($block[1] & 0x00080000) >> 6) | (($block[1] & 0x08000000) >> 15) |
- (($block[0] & 0x00000008) << 8) | (($block[0] & 0x00000800) >> 1) |
- (($block[0] & 0x00080000) >> 10) | (($block[0] & 0x08000000) >> 19) |
- (($block[1] & 0x00000200) >> 3) | (($block[0] & 0x00000200) >> 7) |
- (($block[1] & 0x00020000) >> 12) | (($block[1] & 0x02000000) >> 21) |
- (($block[0] & 0x00020000) >> 16) | (($block[0] & 0x02000000) >> 25) |
- ($msb[1] << 28) | ($msb[0] << 24)
- );
-
- for ($i = 0; $i < 16; $i++) {
- // start of "the Feistel (F) function" - see the following URL:
- // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
- $temp = (($sbox[0][((($block[1] >> 27) & 0x1F) | (($block[1] & 1) << 5)) ^ $keys[$mode][$i][0]]) << 28)
- | (($sbox[1][(($block[1] & 0x1F800000) >> 23) ^ $keys[$mode][$i][1]]) << 24)
- | (($sbox[2][(($block[1] & 0x01F80000) >> 19) ^ $keys[$mode][$i][2]]) << 20)
- | (($sbox[3][(($block[1] & 0x001F8000) >> 15) ^ $keys[$mode][$i][3]]) << 16)
- | (($sbox[4][(($block[1] & 0x0001F800) >> 11) ^ $keys[$mode][$i][4]]) << 12)
- | (($sbox[5][(($block[1] & 0x00001F80) >> 7) ^ $keys[$mode][$i][5]]) << 8)
- | (($sbox[6][(($block[1] & 0x000001F8) >> 3) ^ $keys[$mode][$i][6]]) << 4)
- | ( $sbox[7][((($block[1] & 0x1F) << 1) | (($block[1] >> 31) & 1)) ^ $keys[$mode][$i][7]]);
-
- $msb = ($temp >> 31) & 1;
- $temp &= 0x7FFFFFFF;
- $newBlock = (($temp & 0x00010000) << 15) | (($temp & 0x02020120) << 5)
- | (($temp & 0x00001800) << 17) | (($temp & 0x01000000) >> 10)
- | (($temp & 0x00000008) << 24) | (($temp & 0x00100000) << 6)
- | (($temp & 0x00000010) << 21) | (($temp & 0x00008000) << 9)
- | (($temp & 0x00000200) << 12) | (($temp & 0x10000000) >> 27)
- | (($temp & 0x00000040) << 14) | (($temp & 0x08000000) >> 8)
- | (($temp & 0x00004000) << 4) | (($temp & 0x00000002) << 16)
- | (($temp & 0x00442000) >> 6) | (($temp & 0x40800000) >> 15)
- | (($temp & 0x00000001) << 11) | (($temp & 0x20000000) >> 20)
- | (($temp & 0x00080000) >> 13) | (($temp & 0x00000004) << 3)
- | (($temp & 0x04000000) >> 22) | (($temp & 0x00000480) >> 7)
- | (($temp & 0x00200000) >> 19) | ($msb << 23);
- // end of "the Feistel (F) function" - $newBlock is F's output
-
- $temp = $block[1];
- $block[1] = $block[0] ^ $newBlock;
- $block[0] = $temp;
+ static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
+ if (!$sbox1) {
+ $sbox1 = array_map("intval", $this->sbox1);
+ $sbox2 = array_map("intval", $this->sbox2);
+ $sbox3 = array_map("intval", $this->sbox3);
+ $sbox4 = array_map("intval", $this->sbox4);
+ $sbox5 = array_map("intval", $this->sbox5);
+ $sbox6 = array_map("intval", $this->sbox6);
+ $sbox7 = array_map("intval", $this->sbox7);
+ $sbox8 = array_map("intval", $this->sbox8);
+ /* Merge $shuffle with $[inv]ipmap */
+ for ($i = 0; $i < 256; ++$i) {
+ $shuffleip[] = $this->shuffle[$this->ipmap[$i]];
+ $shuffleinvip[] = $this->shuffle[$this->invipmap[$i]];
+ }
}
- $msb = array(
- ($block[0] >> 31) & 1,
- ($block[1] >> 31) & 1
- );
- $block[0] &= 0x7FFFFFFF;
- $block[1] &= 0x7FFFFFFF;
+ $keys = $this->keys[$mode];
+ $ki = -1;
+
+ // Do the initial IP permutation.
+ $t = unpack('Nl/Nr', $block);
+ list($l, $r) = array($t['l'], $t['r']);
+ $block = ($shuffleip[ $r & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+ ($shuffleip[($r >> 8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+ ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+ ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+ ($shuffleip[ $l & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+ ($shuffleip[($l >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+ ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+ ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+
+ // Extract L0 and R0.
+ $t = unpack('Nl/Nr', $block);
+ list($l, $r) = array($t['l'], $t['r']);
+
+ for ($des_round = 0; $des_round < $this->des_rounds; ++$des_round) {
+ // Perform the 16 steps.
+ for ($i = 0; $i < 16; $i++) {
+ // start of "the Feistel (F) function" - see the following URL:
+ // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
+ // Merge key schedule.
+ $b1 = (($r >> 3) & 0x1FFFFFFF) ^ ($r << 29) ^ $keys[++$ki];
+ $b2 = (($r >> 31) & 0x00000001) ^ ($r << 1) ^ $keys[++$ki];
+
+ // S-box indexing.
+ $t = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+ $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
+ $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^
+ $sbox7[ $b1 & 0x3F] ^ $sbox8[ $b2 & 0x3F] ^ $l;
+ // end of "the Feistel (F) function"
+
+ $l = $r;
+ $r = $t;
+ }
- $block = array(
- (($block[0] & 0x01000004) << 7) | (($block[1] & 0x01000004) << 6) |
- (($block[0] & 0x00010000) << 13) | (($block[1] & 0x00010000) << 12) |
- (($block[0] & 0x00000100) << 19) | (($block[1] & 0x00000100) << 18) |
- (($block[0] & 0x00000001) << 25) | (($block[1] & 0x00000001) << 24) |
- (($block[0] & 0x02000008) >> 2) | (($block[1] & 0x02000008) >> 3) |
- (($block[0] & 0x00020000) << 4) | (($block[1] & 0x00020000) << 3) |
- (($block[0] & 0x00000200) << 10) | (($block[1] & 0x00000200) << 9) |
- (($block[0] & 0x00000002) << 16) | (($block[1] & 0x00000002) << 15) |
- (($block[0] & 0x04000000) >> 11) | (($block[1] & 0x04000000) >> 12) |
- (($block[0] & 0x00040000) >> 5) | (($block[1] & 0x00040000) >> 6) |
- (($block[0] & 0x00000400) << 1) | ( $block[1] & 0x00000400 ) |
- (($block[0] & 0x08000000) >> 20) | (($block[1] & 0x08000000) >> 21) |
- (($block[0] & 0x00080000) >> 14) | (($block[1] & 0x00080000) >> 15) |
- (($block[0] & 0x00000800) >> 8) | (($block[1] & 0x00000800) >> 9)
- ,
- (($block[0] & 0x10000040) << 3) | (($block[1] & 0x10000040) << 2) |
- (($block[0] & 0x00100000) << 9) | (($block[1] & 0x00100000) << 8) |
- (($block[0] & 0x00001000) << 15) | (($block[1] & 0x00001000) << 14) |
- (($block[0] & 0x00000010) << 21) | (($block[1] & 0x00000010) << 20) |
- (($block[0] & 0x20000080) >> 6) | (($block[1] & 0x20000080) >> 7) |
- ( $block[0] & 0x00200000 ) | (($block[1] & 0x00200000) >> 1) |
- (($block[0] & 0x00002000) << 6) | (($block[1] & 0x00002000) << 5) |
- (($block[0] & 0x00000020) << 12) | (($block[1] & 0x00000020) << 11) |
- (($block[0] & 0x40000000) >> 15) | (($block[1] & 0x40000000) >> 16) |
- (($block[0] & 0x00400000) >> 9) | (($block[1] & 0x00400000) >> 10) |
- (($block[0] & 0x00004000) >> 3) | (($block[1] & 0x00004000) >> 4) |
- (($block[0] & 0x00800000) >> 18) | (($block[1] & 0x00800000) >> 19) |
- (($block[0] & 0x00008000) >> 12) | (($block[1] & 0x00008000) >> 13) |
- ($msb[0] << 7) | ($msb[1] << 6)
- );
+ // Last step should not permute L & R.
+ $t = $l;
+ $l = $r;
+ $r = $t;
+ }
- return pack('NN', $block[0], $block[1]);
+ // Perform the inverse IP permutation.
+ return ($shuffleinvip[($r >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+ ($shuffleinvip[($l >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+ ($shuffleinvip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+ ($shuffleinvip[($l >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+ ($shuffleinvip[($r >> 8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+ ($shuffleinvip[($l >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+ ($shuffleinvip[ $r & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+ ($shuffleinvip[ $l & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
}
/**
- * Creates the key schedule.
+ * Creates the key schedule
*
+ * @see Crypt_Base::_setupKey()
* @access private
- * @param String $key
- * @return Array
*/
- function _prepareKey($key)
+ function _setupKey()
{
+ if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->des_rounds === $this->kl['des_rounds']) {
+ // already expanded
+ return;
+ }
+ $this->kl = array('key' => $this->key, 'des_rounds' => $this->des_rounds);
+
static $shifts = array( // number of key bits shifted per round
1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
);
- // pad the key and remove extra characters as appropriate.
- $key = str_pad(substr($key, 0, 8), 8, chr(0));
-
- $temp = unpack('Na/Nb', $key);
- $key = array($temp['a'], $temp['b']);
- $msb = array(
- ($key[0] >> 31) & 1,
- ($key[1] >> 31) & 1
+ static $pc1map = array(
+ 0x00, 0x00, 0x08, 0x08, 0x04, 0x04, 0x0C, 0x0C,
+ 0x02, 0x02, 0x0A, 0x0A, 0x06, 0x06, 0x0E, 0x0E,
+ 0x10, 0x10, 0x18, 0x18, 0x14, 0x14, 0x1C, 0x1C,
+ 0x12, 0x12, 0x1A, 0x1A, 0x16, 0x16, 0x1E, 0x1E,
+ 0x20, 0x20, 0x28, 0x28, 0x24, 0x24, 0x2C, 0x2C,
+ 0x22, 0x22, 0x2A, 0x2A, 0x26, 0x26, 0x2E, 0x2E,
+ 0x30, 0x30, 0x38, 0x38, 0x34, 0x34, 0x3C, 0x3C,
+ 0x32, 0x32, 0x3A, 0x3A, 0x36, 0x36, 0x3E, 0x3E,
+ 0x40, 0x40, 0x48, 0x48, 0x44, 0x44, 0x4C, 0x4C,
+ 0x42, 0x42, 0x4A, 0x4A, 0x46, 0x46, 0x4E, 0x4E,
+ 0x50, 0x50, 0x58, 0x58, 0x54, 0x54, 0x5C, 0x5C,
+ 0x52, 0x52, 0x5A, 0x5A, 0x56, 0x56, 0x5E, 0x5E,
+ 0x60, 0x60, 0x68, 0x68, 0x64, 0x64, 0x6C, 0x6C,
+ 0x62, 0x62, 0x6A, 0x6A, 0x66, 0x66, 0x6E, 0x6E,
+ 0x70, 0x70, 0x78, 0x78, 0x74, 0x74, 0x7C, 0x7C,
+ 0x72, 0x72, 0x7A, 0x7A, 0x76, 0x76, 0x7E, 0x7E,
+ 0x80, 0x80, 0x88, 0x88, 0x84, 0x84, 0x8C, 0x8C,
+ 0x82, 0x82, 0x8A, 0x8A, 0x86, 0x86, 0x8E, 0x8E,
+ 0x90, 0x90, 0x98, 0x98, 0x94, 0x94, 0x9C, 0x9C,
+ 0x92, 0x92, 0x9A, 0x9A, 0x96, 0x96, 0x9E, 0x9E,
+ 0xA0, 0xA0, 0xA8, 0xA8, 0xA4, 0xA4, 0xAC, 0xAC,
+ 0xA2, 0xA2, 0xAA, 0xAA, 0xA6, 0xA6, 0xAE, 0xAE,
+ 0xB0, 0xB0, 0xB8, 0xB8, 0xB4, 0xB4, 0xBC, 0xBC,
+ 0xB2, 0xB2, 0xBA, 0xBA, 0xB6, 0xB6, 0xBE, 0xBE,
+ 0xC0, 0xC0, 0xC8, 0xC8, 0xC4, 0xC4, 0xCC, 0xCC,
+ 0xC2, 0xC2, 0xCA, 0xCA, 0xC6, 0xC6, 0xCE, 0xCE,
+ 0xD0, 0xD0, 0xD8, 0xD8, 0xD4, 0xD4, 0xDC, 0xDC,
+ 0xD2, 0xD2, 0xDA, 0xDA, 0xD6, 0xD6, 0xDE, 0xDE,
+ 0xE0, 0xE0, 0xE8, 0xE8, 0xE4, 0xE4, 0xEC, 0xEC,
+ 0xE2, 0xE2, 0xEA, 0xEA, 0xE6, 0xE6, 0xEE, 0xEE,
+ 0xF0, 0xF0, 0xF8, 0xF8, 0xF4, 0xF4, 0xFC, 0xFC,
+ 0xF2, 0xF2, 0xFA, 0xFA, 0xF6, 0xF6, 0xFE, 0xFE
);
- $key[0] &= 0x7FFFFFFF;
- $key[1] &= 0x7FFFFFFF;
- $key = array(
- (($key[1] & 0x00000002) << 26) | (($key[1] & 0x00000204) << 17) |
- (($key[1] & 0x00020408) << 8) | (($key[1] & 0x02040800) >> 1) |
- (($key[0] & 0x00000002) << 22) | (($key[0] & 0x00000204) << 13) |
- (($key[0] & 0x00020408) << 4) | (($key[0] & 0x02040800) >> 5) |
- (($key[1] & 0x04080000) >> 10) | (($key[0] & 0x04080000) >> 14) |
- (($key[1] & 0x08000000) >> 19) | (($key[0] & 0x08000000) >> 23) |
- (($key[0] & 0x00000010) >> 1) | (($key[0] & 0x00001000) >> 10) |
- (($key[0] & 0x00100000) >> 19) | (($key[0] & 0x10000000) >> 28)
- ,
- (($key[1] & 0x00000080) << 20) | (($key[1] & 0x00008000) << 11) |
- (($key[1] & 0x00800000) << 2) | (($key[0] & 0x00000080) << 16) |
- (($key[0] & 0x00008000) << 7) | (($key[0] & 0x00800000) >> 2) |
- (($key[1] & 0x00000040) << 13) | (($key[1] & 0x00004000) << 4) |
- (($key[1] & 0x00400000) >> 5) | (($key[1] & 0x40000000) >> 14) |
- (($key[0] & 0x00000040) << 9) | ( $key[0] & 0x00004000 ) |
- (($key[0] & 0x00400000) >> 9) | (($key[0] & 0x40000000) >> 18) |
- (($key[1] & 0x00000020) << 6) | (($key[1] & 0x00002000) >> 3) |
- (($key[1] & 0x00200000) >> 12) | (($key[1] & 0x20000000) >> 21) |
- (($key[0] & 0x00000020) << 2) | (($key[0] & 0x00002000) >> 7) |
- (($key[0] & 0x00200000) >> 16) | (($key[0] & 0x20000000) >> 25) |
- (($key[1] & 0x00000010) >> 1) | (($key[1] & 0x00001000) >> 10) |
- (($key[1] & 0x00100000) >> 19) | (($key[1] & 0x10000000) >> 28) |
- ($msb[1] << 24) | ($msb[0] << 20)
+ // Mapping tables for the PC-2 transformation.
+ static $pc2mapc1 = array(
+ 0x00000000, 0x00000400, 0x00200000, 0x00200400,
+ 0x00000001, 0x00000401, 0x00200001, 0x00200401,
+ 0x02000000, 0x02000400, 0x02200000, 0x02200400,
+ 0x02000001, 0x02000401, 0x02200001, 0x02200401
+ );
+ static $pc2mapc2 = array(
+ 0x00000000, 0x00000800, 0x08000000, 0x08000800,
+ 0x00010000, 0x00010800, 0x08010000, 0x08010800,
+ 0x00000000, 0x00000800, 0x08000000, 0x08000800,
+ 0x00010000, 0x00010800, 0x08010000, 0x08010800,
+ 0x00000100, 0x00000900, 0x08000100, 0x08000900,
+ 0x00010100, 0x00010900, 0x08010100, 0x08010900,
+ 0x00000100, 0x00000900, 0x08000100, 0x08000900,
+ 0x00010100, 0x00010900, 0x08010100, 0x08010900,
+ 0x00000010, 0x00000810, 0x08000010, 0x08000810,
+ 0x00010010, 0x00010810, 0x08010010, 0x08010810,
+ 0x00000010, 0x00000810, 0x08000010, 0x08000810,
+ 0x00010010, 0x00010810, 0x08010010, 0x08010810,
+ 0x00000110, 0x00000910, 0x08000110, 0x08000910,
+ 0x00010110, 0x00010910, 0x08010110, 0x08010910,
+ 0x00000110, 0x00000910, 0x08000110, 0x08000910,
+ 0x00010110, 0x00010910, 0x08010110, 0x08010910,
+ 0x00040000, 0x00040800, 0x08040000, 0x08040800,
+ 0x00050000, 0x00050800, 0x08050000, 0x08050800,
+ 0x00040000, 0x00040800, 0x08040000, 0x08040800,
+ 0x00050000, 0x00050800, 0x08050000, 0x08050800,
+ 0x00040100, 0x00040900, 0x08040100, 0x08040900,
+ 0x00050100, 0x00050900, 0x08050100, 0x08050900,
+ 0x00040100, 0x00040900, 0x08040100, 0x08040900,
+ 0x00050100, 0x00050900, 0x08050100, 0x08050900,
+ 0x00040010, 0x00040810, 0x08040010, 0x08040810,
+ 0x00050010, 0x00050810, 0x08050010, 0x08050810,
+ 0x00040010, 0x00040810, 0x08040010, 0x08040810,
+ 0x00050010, 0x00050810, 0x08050010, 0x08050810,
+ 0x00040110, 0x00040910, 0x08040110, 0x08040910,
+ 0x00050110, 0x00050910, 0x08050110, 0x08050910,
+ 0x00040110, 0x00040910, 0x08040110, 0x08040910,
+ 0x00050110, 0x00050910, 0x08050110, 0x08050910,
+ 0x01000000, 0x01000800, 0x09000000, 0x09000800,
+ 0x01010000, 0x01010800, 0x09010000, 0x09010800,
+ 0x01000000, 0x01000800, 0x09000000, 0x09000800,
+ 0x01010000, 0x01010800, 0x09010000, 0x09010800,
+ 0x01000100, 0x01000900, 0x09000100, 0x09000900,
+ 0x01010100, 0x01010900, 0x09010100, 0x09010900,
+ 0x01000100, 0x01000900, 0x09000100, 0x09000900,
+ 0x01010100, 0x01010900, 0x09010100, 0x09010900,
+ 0x01000010, 0x01000810, 0x09000010, 0x09000810,
+ 0x01010010, 0x01010810, 0x09010010, 0x09010810,
+ 0x01000010, 0x01000810, 0x09000010, 0x09000810,
+ 0x01010010, 0x01010810, 0x09010010, 0x09010810,
+ 0x01000110, 0x01000910, 0x09000110, 0x09000910,
+ 0x01010110, 0x01010910, 0x09010110, 0x09010910,
+ 0x01000110, 0x01000910, 0x09000110, 0x09000910,
+ 0x01010110, 0x01010910, 0x09010110, 0x09010910,
+ 0x01040000, 0x01040800, 0x09040000, 0x09040800,
+ 0x01050000, 0x01050800, 0x09050000, 0x09050800,
+ 0x01040000, 0x01040800, 0x09040000, 0x09040800,
+ 0x01050000, 0x01050800, 0x09050000, 0x09050800,
+ 0x01040100, 0x01040900, 0x09040100, 0x09040900,
+ 0x01050100, 0x01050900, 0x09050100, 0x09050900,
+ 0x01040100, 0x01040900, 0x09040100, 0x09040900,
+ 0x01050100, 0x01050900, 0x09050100, 0x09050900,
+ 0x01040010, 0x01040810, 0x09040010, 0x09040810,
+ 0x01050010, 0x01050810, 0x09050010, 0x09050810,
+ 0x01040010, 0x01040810, 0x09040010, 0x09040810,
+ 0x01050010, 0x01050810, 0x09050010, 0x09050810,
+ 0x01040110, 0x01040910, 0x09040110, 0x09040910,
+ 0x01050110, 0x01050910, 0x09050110, 0x09050910,
+ 0x01040110, 0x01040910, 0x09040110, 0x09040910,
+ 0x01050110, 0x01050910, 0x09050110, 0x09050910
+ );
+ static $pc2mapc3 = array(
+ 0x00000000, 0x00000004, 0x00001000, 0x00001004,
+ 0x00000000, 0x00000004, 0x00001000, 0x00001004,
+ 0x10000000, 0x10000004, 0x10001000, 0x10001004,
+ 0x10000000, 0x10000004, 0x10001000, 0x10001004,
+ 0x00000020, 0x00000024, 0x00001020, 0x00001024,
+ 0x00000020, 0x00000024, 0x00001020, 0x00001024,
+ 0x10000020, 0x10000024, 0x10001020, 0x10001024,
+ 0x10000020, 0x10000024, 0x10001020, 0x10001024,
+ 0x00080000, 0x00080004, 0x00081000, 0x00081004,
+ 0x00080000, 0x00080004, 0x00081000, 0x00081004,
+ 0x10080000, 0x10080004, 0x10081000, 0x10081004,
+ 0x10080000, 0x10080004, 0x10081000, 0x10081004,
+ 0x00080020, 0x00080024, 0x00081020, 0x00081024,
+ 0x00080020, 0x00080024, 0x00081020, 0x00081024,
+ 0x10080020, 0x10080024, 0x10081020, 0x10081024,
+ 0x10080020, 0x10080024, 0x10081020, 0x10081024,
+ 0x20000000, 0x20000004, 0x20001000, 0x20001004,
+ 0x20000000, 0x20000004, 0x20001000, 0x20001004,
+ 0x30000000, 0x30000004, 0x30001000, 0x30001004,
+ 0x30000000, 0x30000004, 0x30001000, 0x30001004,
+ 0x20000020, 0x20000024, 0x20001020, 0x20001024,
+ 0x20000020, 0x20000024, 0x20001020, 0x20001024,
+ 0x30000020, 0x30000024, 0x30001020, 0x30001024,
+ 0x30000020, 0x30000024, 0x30001020, 0x30001024,
+ 0x20080000, 0x20080004, 0x20081000, 0x20081004,
+ 0x20080000, 0x20080004, 0x20081000, 0x20081004,
+ 0x30080000, 0x30080004, 0x30081000, 0x30081004,
+ 0x30080000, 0x30080004, 0x30081000, 0x30081004,
+ 0x20080020, 0x20080024, 0x20081020, 0x20081024,
+ 0x20080020, 0x20080024, 0x20081020, 0x20081024,
+ 0x30080020, 0x30080024, 0x30081020, 0x30081024,
+ 0x30080020, 0x30080024, 0x30081020, 0x30081024,
+ 0x00000002, 0x00000006, 0x00001002, 0x00001006,
+ 0x00000002, 0x00000006, 0x00001002, 0x00001006,
+ 0x10000002, 0x10000006, 0x10001002, 0x10001006,
+ 0x10000002, 0x10000006, 0x10001002, 0x10001006,
+ 0x00000022, 0x00000026, 0x00001022, 0x00001026,
+ 0x00000022, 0x00000026, 0x00001022, 0x00001026,
+ 0x10000022, 0x10000026, 0x10001022, 0x10001026,
+ 0x10000022, 0x10000026, 0x10001022, 0x10001026,
+ 0x00080002, 0x00080006, 0x00081002, 0x00081006,
+ 0x00080002, 0x00080006, 0x00081002, 0x00081006,
+ 0x10080002, 0x10080006, 0x10081002, 0x10081006,
+ 0x10080002, 0x10080006, 0x10081002, 0x10081006,
+ 0x00080022, 0x00080026, 0x00081022, 0x00081026,
+ 0x00080022, 0x00080026, 0x00081022, 0x00081026,
+ 0x10080022, 0x10080026, 0x10081022, 0x10081026,
+ 0x10080022, 0x10080026, 0x10081022, 0x10081026,
+ 0x20000002, 0x20000006, 0x20001002, 0x20001006,
+ 0x20000002, 0x20000006, 0x20001002, 0x20001006,
+ 0x30000002, 0x30000006, 0x30001002, 0x30001006,
+ 0x30000002, 0x30000006, 0x30001002, 0x30001006,
+ 0x20000022, 0x20000026, 0x20001022, 0x20001026,
+ 0x20000022, 0x20000026, 0x20001022, 0x20001026,
+ 0x30000022, 0x30000026, 0x30001022, 0x30001026,
+ 0x30000022, 0x30000026, 0x30001022, 0x30001026,
+ 0x20080002, 0x20080006, 0x20081002, 0x20081006,
+ 0x20080002, 0x20080006, 0x20081002, 0x20081006,
+ 0x30080002, 0x30080006, 0x30081002, 0x30081006,
+ 0x30080002, 0x30080006, 0x30081002, 0x30081006,
+ 0x20080022, 0x20080026, 0x20081022, 0x20081026,
+ 0x20080022, 0x20080026, 0x20081022, 0x20081026,
+ 0x30080022, 0x30080026, 0x30081022, 0x30081026,
+ 0x30080022, 0x30080026, 0x30081022, 0x30081026
+ );
+ static $pc2mapc4 = array(
+ 0x00000000, 0x00100000, 0x00000008, 0x00100008,
+ 0x00000200, 0x00100200, 0x00000208, 0x00100208,
+ 0x00000000, 0x00100000, 0x00000008, 0x00100008,
+ 0x00000200, 0x00100200, 0x00000208, 0x00100208,
+ 0x04000000, 0x04100000, 0x04000008, 0x04100008,
+ 0x04000200, 0x04100200, 0x04000208, 0x04100208,
+ 0x04000000, 0x04100000, 0x04000008, 0x04100008,
+ 0x04000200, 0x04100200, 0x04000208, 0x04100208,
+ 0x00002000, 0x00102000, 0x00002008, 0x00102008,
+ 0x00002200, 0x00102200, 0x00002208, 0x00102208,
+ 0x00002000, 0x00102000, 0x00002008, 0x00102008,
+ 0x00002200, 0x00102200, 0x00002208, 0x00102208,
+ 0x04002000, 0x04102000, 0x04002008, 0x04102008,
+ 0x04002200, 0x04102200, 0x04002208, 0x04102208,
+ 0x04002000, 0x04102000, 0x04002008, 0x04102008,
+ 0x04002200, 0x04102200, 0x04002208, 0x04102208,
+ 0x00000000, 0x00100000, 0x00000008, 0x00100008,
+ 0x00000200, 0x00100200, 0x00000208, 0x00100208,
+ 0x00000000, 0x00100000, 0x00000008, 0x00100008,
+ 0x00000200, 0x00100200, 0x00000208, 0x00100208,
+ 0x04000000, 0x04100000, 0x04000008, 0x04100008,
+ 0x04000200, 0x04100200, 0x04000208, 0x04100208,
+ 0x04000000, 0x04100000, 0x04000008, 0x04100008,
+ 0x04000200, 0x04100200, 0x04000208, 0x04100208,
+ 0x00002000, 0x00102000, 0x00002008, 0x00102008,
+ 0x00002200, 0x00102200, 0x00002208, 0x00102208,
+ 0x00002000, 0x00102000, 0x00002008, 0x00102008,
+ 0x00002200, 0x00102200, 0x00002208, 0x00102208,
+ 0x04002000, 0x04102000, 0x04002008, 0x04102008,
+ 0x04002200, 0x04102200, 0x04002208, 0x04102208,
+ 0x04002000, 0x04102000, 0x04002008, 0x04102008,
+ 0x04002200, 0x04102200, 0x04002208, 0x04102208,
+ 0x00020000, 0x00120000, 0x00020008, 0x00120008,
+ 0x00020200, 0x00120200, 0x00020208, 0x00120208,
+ 0x00020000, 0x00120000, 0x00020008, 0x00120008,
+ 0x00020200, 0x00120200, 0x00020208, 0x00120208,
+ 0x04020000, 0x04120000, 0x04020008, 0x04120008,
+ 0x04020200, 0x04120200, 0x04020208, 0x04120208,
+ 0x04020000, 0x04120000, 0x04020008, 0x04120008,
+ 0x04020200, 0x04120200, 0x04020208, 0x04120208,
+ 0x00022000, 0x00122000, 0x00022008, 0x00122008,
+ 0x00022200, 0x00122200, 0x00022208, 0x00122208,
+ 0x00022000, 0x00122000, 0x00022008, 0x00122008,
+ 0x00022200, 0x00122200, 0x00022208, 0x00122208,
+ 0x04022000, 0x04122000, 0x04022008, 0x04122008,
+ 0x04022200, 0x04122200, 0x04022208, 0x04122208,
+ 0x04022000, 0x04122000, 0x04022008, 0x04122008,
+ 0x04022200, 0x04122200, 0x04022208, 0x04122208,
+ 0x00020000, 0x00120000, 0x00020008, 0x00120008,
+ 0x00020200, 0x00120200, 0x00020208, 0x00120208,
+ 0x00020000, 0x00120000, 0x00020008, 0x00120008,
+ 0x00020200, 0x00120200, 0x00020208, 0x00120208,
+ 0x04020000, 0x04120000, 0x04020008, 0x04120008,
+ 0x04020200, 0x04120200, 0x04020208, 0x04120208,
+ 0x04020000, 0x04120000, 0x04020008, 0x04120008,
+ 0x04020200, 0x04120200, 0x04020208, 0x04120208,
+ 0x00022000, 0x00122000, 0x00022008, 0x00122008,
+ 0x00022200, 0x00122200, 0x00022208, 0x00122208,
+ 0x00022000, 0x00122000, 0x00022008, 0x00122008,
+ 0x00022200, 0x00122200, 0x00022208, 0x00122208,
+ 0x04022000, 0x04122000, 0x04022008, 0x04122008,
+ 0x04022200, 0x04122200, 0x04022208, 0x04122208,
+ 0x04022000, 0x04122000, 0x04022008, 0x04122008,
+ 0x04022200, 0x04122200, 0x04022208, 0x04122208
+ );
+ static $pc2mapd1 = array(
+ 0x00000000, 0x00000001, 0x08000000, 0x08000001,
+ 0x00200000, 0x00200001, 0x08200000, 0x08200001,
+ 0x00000002, 0x00000003, 0x08000002, 0x08000003,
+ 0x00200002, 0x00200003, 0x08200002, 0x08200003
+ );
+ static $pc2mapd2 = array(
+ 0x00000000, 0x00100000, 0x00000800, 0x00100800,
+ 0x00000000, 0x00100000, 0x00000800, 0x00100800,
+ 0x04000000, 0x04100000, 0x04000800, 0x04100800,
+ 0x04000000, 0x04100000, 0x04000800, 0x04100800,
+ 0x00000004, 0x00100004, 0x00000804, 0x00100804,
+ 0x00000004, 0x00100004, 0x00000804, 0x00100804,
+ 0x04000004, 0x04100004, 0x04000804, 0x04100804,
+ 0x04000004, 0x04100004, 0x04000804, 0x04100804,
+ 0x00000000, 0x00100000, 0x00000800, 0x00100800,
+ 0x00000000, 0x00100000, 0x00000800, 0x00100800,
+ 0x04000000, 0x04100000, 0x04000800, 0x04100800,
+ 0x04000000, 0x04100000, 0x04000800, 0x04100800,
+ 0x00000004, 0x00100004, 0x00000804, 0x00100804,
+ 0x00000004, 0x00100004, 0x00000804, 0x00100804,
+ 0x04000004, 0x04100004, 0x04000804, 0x04100804,
+ 0x04000004, 0x04100004, 0x04000804, 0x04100804,
+ 0x00000200, 0x00100200, 0x00000A00, 0x00100A00,
+ 0x00000200, 0x00100200, 0x00000A00, 0x00100A00,
+ 0x04000200, 0x04100200, 0x04000A00, 0x04100A00,
+ 0x04000200, 0x04100200, 0x04000A00, 0x04100A00,
+ 0x00000204, 0x00100204, 0x00000A04, 0x00100A04,
+ 0x00000204, 0x00100204, 0x00000A04, 0x00100A04,
+ 0x04000204, 0x04100204, 0x04000A04, 0x04100A04,
+ 0x04000204, 0x04100204, 0x04000A04, 0x04100A04,
+ 0x00000200, 0x00100200, 0x00000A00, 0x00100A00,
+ 0x00000200, 0x00100200, 0x00000A00, 0x00100A00,
+ 0x04000200, 0x04100200, 0x04000A00, 0x04100A00,
+ 0x04000200, 0x04100200, 0x04000A00, 0x04100A00,
+ 0x00000204, 0x00100204, 0x00000A04, 0x00100A04,
+ 0x00000204, 0x00100204, 0x00000A04, 0x00100A04,
+ 0x04000204, 0x04100204, 0x04000A04, 0x04100A04,
+ 0x04000204, 0x04100204, 0x04000A04, 0x04100A04,
+ 0x00020000, 0x00120000, 0x00020800, 0x00120800,
+ 0x00020000, 0x00120000, 0x00020800, 0x00120800,
+ 0x04020000, 0x04120000, 0x04020800, 0x04120800,
+ 0x04020000, 0x04120000, 0x04020800, 0x04120800,
+ 0x00020004, 0x00120004, 0x00020804, 0x00120804,
+ 0x00020004, 0x00120004, 0x00020804, 0x00120804,
+ 0x04020004, 0x04120004, 0x04020804, 0x04120804,
+ 0x04020004, 0x04120004, 0x04020804, 0x04120804,
+ 0x00020000, 0x00120000, 0x00020800, 0x00120800,
+ 0x00020000, 0x00120000, 0x00020800, 0x00120800,
+ 0x04020000, 0x04120000, 0x04020800, 0x04120800,
+ 0x04020000, 0x04120000, 0x04020800, 0x04120800,
+ 0x00020004, 0x00120004, 0x00020804, 0x00120804,
+ 0x00020004, 0x00120004, 0x00020804, 0x00120804,
+ 0x04020004, 0x04120004, 0x04020804, 0x04120804,
+ 0x04020004, 0x04120004, 0x04020804, 0x04120804,
+ 0x00020200, 0x00120200, 0x00020A00, 0x00120A00,
+ 0x00020200, 0x00120200, 0x00020A00, 0x00120A00,
+ 0x04020200, 0x04120200, 0x04020A00, 0x04120A00,
+ 0x04020200, 0x04120200, 0x04020A00, 0x04120A00,
+ 0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
+ 0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
+ 0x04020204, 0x04120204, 0x04020A04, 0x04120A04,
+ 0x04020204, 0x04120204, 0x04020A04, 0x04120A04,
+ 0x00020200, 0x00120200, 0x00020A00, 0x00120A00,
+ 0x00020200, 0x00120200, 0x00020A00, 0x00120A00,
+ 0x04020200, 0x04120200, 0x04020A00, 0x04120A00,
+ 0x04020200, 0x04120200, 0x04020A00, 0x04120A00,
+ 0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
+ 0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
+ 0x04020204, 0x04120204, 0x04020A04, 0x04120A04,
+ 0x04020204, 0x04120204, 0x04020A04, 0x04120A04
+ );
+ static $pc2mapd3 = array(
+ 0x00000000, 0x00010000, 0x02000000, 0x02010000,
+ 0x00000020, 0x00010020, 0x02000020, 0x02010020,
+ 0x00040000, 0x00050000, 0x02040000, 0x02050000,
+ 0x00040020, 0x00050020, 0x02040020, 0x02050020,
+ 0x00002000, 0x00012000, 0x02002000, 0x02012000,
+ 0x00002020, 0x00012020, 0x02002020, 0x02012020,
+ 0x00042000, 0x00052000, 0x02042000, 0x02052000,
+ 0x00042020, 0x00052020, 0x02042020, 0x02052020,
+ 0x00000000, 0x00010000, 0x02000000, 0x02010000,
+ 0x00000020, 0x00010020, 0x02000020, 0x02010020,
+ 0x00040000, 0x00050000, 0x02040000, 0x02050000,
+ 0x00040020, 0x00050020, 0x02040020, 0x02050020,
+ 0x00002000, 0x00012000, 0x02002000, 0x02012000,
+ 0x00002020, 0x00012020, 0x02002020, 0x02012020,
+ 0x00042000, 0x00052000, 0x02042000, 0x02052000,
+ 0x00042020, 0x00052020, 0x02042020, 0x02052020,
+ 0x00000010, 0x00010010, 0x02000010, 0x02010010,
+ 0x00000030, 0x00010030, 0x02000030, 0x02010030,
+ 0x00040010, 0x00050010, 0x02040010, 0x02050010,
+ 0x00040030, 0x00050030, 0x02040030, 0x02050030,
+ 0x00002010, 0x00012010, 0x02002010, 0x02012010,
+ 0x00002030, 0x00012030, 0x02002030, 0x02012030,
+ 0x00042010, 0x00052010, 0x02042010, 0x02052010,
+ 0x00042030, 0x00052030, 0x02042030, 0x02052030,
+ 0x00000010, 0x00010010, 0x02000010, 0x02010010,
+ 0x00000030, 0x00010030, 0x02000030, 0x02010030,
+ 0x00040010, 0x00050010, 0x02040010, 0x02050010,
+ 0x00040030, 0x00050030, 0x02040030, 0x02050030,
+ 0x00002010, 0x00012010, 0x02002010, 0x02012010,
+ 0x00002030, 0x00012030, 0x02002030, 0x02012030,
+ 0x00042010, 0x00052010, 0x02042010, 0x02052010,
+ 0x00042030, 0x00052030, 0x02042030, 0x02052030,
+ 0x20000000, 0x20010000, 0x22000000, 0x22010000,
+ 0x20000020, 0x20010020, 0x22000020, 0x22010020,
+ 0x20040000, 0x20050000, 0x22040000, 0x22050000,
+ 0x20040020, 0x20050020, 0x22040020, 0x22050020,
+ 0x20002000, 0x20012000, 0x22002000, 0x22012000,
+ 0x20002020, 0x20012020, 0x22002020, 0x22012020,
+ 0x20042000, 0x20052000, 0x22042000, 0x22052000,
+ 0x20042020, 0x20052020, 0x22042020, 0x22052020,
+ 0x20000000, 0x20010000, 0x22000000, 0x22010000,
+ 0x20000020, 0x20010020, 0x22000020, 0x22010020,
+ 0x20040000, 0x20050000, 0x22040000, 0x22050000,
+ 0x20040020, 0x20050020, 0x22040020, 0x22050020,
+ 0x20002000, 0x20012000, 0x22002000, 0x22012000,
+ 0x20002020, 0x20012020, 0x22002020, 0x22012020,
+ 0x20042000, 0x20052000, 0x22042000, 0x22052000,
+ 0x20042020, 0x20052020, 0x22042020, 0x22052020,
+ 0x20000010, 0x20010010, 0x22000010, 0x22010010,
+ 0x20000030, 0x20010030, 0x22000030, 0x22010030,
+ 0x20040010, 0x20050010, 0x22040010, 0x22050010,
+ 0x20040030, 0x20050030, 0x22040030, 0x22050030,
+ 0x20002010, 0x20012010, 0x22002010, 0x22012010,
+ 0x20002030, 0x20012030, 0x22002030, 0x22012030,
+ 0x20042010, 0x20052010, 0x22042010, 0x22052010,
+ 0x20042030, 0x20052030, 0x22042030, 0x22052030,
+ 0x20000010, 0x20010010, 0x22000010, 0x22010010,
+ 0x20000030, 0x20010030, 0x22000030, 0x22010030,
+ 0x20040010, 0x20050010, 0x22040010, 0x22050010,
+ 0x20040030, 0x20050030, 0x22040030, 0x22050030,
+ 0x20002010, 0x20012010, 0x22002010, 0x22012010,
+ 0x20002030, 0x20012030, 0x22002030, 0x22012030,
+ 0x20042010, 0x20052010, 0x22042010, 0x22052010,
+ 0x20042030, 0x20052030, 0x22042030, 0x22052030
+ );
+ static $pc2mapd4 = array(
+ 0x00000000, 0x00000400, 0x01000000, 0x01000400,
+ 0x00000000, 0x00000400, 0x01000000, 0x01000400,
+ 0x00000100, 0x00000500, 0x01000100, 0x01000500,
+ 0x00000100, 0x00000500, 0x01000100, 0x01000500,
+ 0x10000000, 0x10000400, 0x11000000, 0x11000400,
+ 0x10000000, 0x10000400, 0x11000000, 0x11000400,
+ 0x10000100, 0x10000500, 0x11000100, 0x11000500,
+ 0x10000100, 0x10000500, 0x11000100, 0x11000500,
+ 0x00080000, 0x00080400, 0x01080000, 0x01080400,
+ 0x00080000, 0x00080400, 0x01080000, 0x01080400,
+ 0x00080100, 0x00080500, 0x01080100, 0x01080500,
+ 0x00080100, 0x00080500, 0x01080100, 0x01080500,
+ 0x10080000, 0x10080400, 0x11080000, 0x11080400,
+ 0x10080000, 0x10080400, 0x11080000, 0x11080400,
+ 0x10080100, 0x10080500, 0x11080100, 0x11080500,
+ 0x10080100, 0x10080500, 0x11080100, 0x11080500,
+ 0x00000008, 0x00000408, 0x01000008, 0x01000408,
+ 0x00000008, 0x00000408, 0x01000008, 0x01000408,
+ 0x00000108, 0x00000508, 0x01000108, 0x01000508,
+ 0x00000108, 0x00000508, 0x01000108, 0x01000508,
+ 0x10000008, 0x10000408, 0x11000008, 0x11000408,
+ 0x10000008, 0x10000408, 0x11000008, 0x11000408,
+ 0x10000108, 0x10000508, 0x11000108, 0x11000508,
+ 0x10000108, 0x10000508, 0x11000108, 0x11000508,
+ 0x00080008, 0x00080408, 0x01080008, 0x01080408,
+ 0x00080008, 0x00080408, 0x01080008, 0x01080408,
+ 0x00080108, 0x00080508, 0x01080108, 0x01080508,
+ 0x00080108, 0x00080508, 0x01080108, 0x01080508,
+ 0x10080008, 0x10080408, 0x11080008, 0x11080408,
+ 0x10080008, 0x10080408, 0x11080008, 0x11080408,
+ 0x10080108, 0x10080508, 0x11080108, 0x11080508,
+ 0x10080108, 0x10080508, 0x11080108, 0x11080508,
+ 0x00001000, 0x00001400, 0x01001000, 0x01001400,
+ 0x00001000, 0x00001400, 0x01001000, 0x01001400,
+ 0x00001100, 0x00001500, 0x01001100, 0x01001500,
+ 0x00001100, 0x00001500, 0x01001100, 0x01001500,
+ 0x10001000, 0x10001400, 0x11001000, 0x11001400,
+ 0x10001000, 0x10001400, 0x11001000, 0x11001400,
+ 0x10001100, 0x10001500, 0x11001100, 0x11001500,
+ 0x10001100, 0x10001500, 0x11001100, 0x11001500,
+ 0x00081000, 0x00081400, 0x01081000, 0x01081400,
+ 0x00081000, 0x00081400, 0x01081000, 0x01081400,
+ 0x00081100, 0x00081500, 0x01081100, 0x01081500,
+ 0x00081100, 0x00081500, 0x01081100, 0x01081500,
+ 0x10081000, 0x10081400, 0x11081000, 0x11081400,
+ 0x10081000, 0x10081400, 0x11081000, 0x11081400,
+ 0x10081100, 0x10081500, 0x11081100, 0x11081500,
+ 0x10081100, 0x10081500, 0x11081100, 0x11081500,
+ 0x00001008, 0x00001408, 0x01001008, 0x01001408,
+ 0x00001008, 0x00001408, 0x01001008, 0x01001408,
+ 0x00001108, 0x00001508, 0x01001108, 0x01001508,
+ 0x00001108, 0x00001508, 0x01001108, 0x01001508,
+ 0x10001008, 0x10001408, 0x11001008, 0x11001408,
+ 0x10001008, 0x10001408, 0x11001008, 0x11001408,
+ 0x10001108, 0x10001508, 0x11001108, 0x11001508,
+ 0x10001108, 0x10001508, 0x11001108, 0x11001508,
+ 0x00081008, 0x00081408, 0x01081008, 0x01081408,
+ 0x00081008, 0x00081408, 0x01081008, 0x01081408,
+ 0x00081108, 0x00081508, 0x01081108, 0x01081508,
+ 0x00081108, 0x00081508, 0x01081108, 0x01081508,
+ 0x10081008, 0x10081408, 0x11081008, 0x11081408,
+ 0x10081008, 0x10081408, 0x11081008, 0x11081408,
+ 0x10081108, 0x10081508, 0x11081108, 0x11081508,
+ 0x10081108, 0x10081508, 0x11081108, 0x11081508
);
$keys = array();
- for ($i = 0; $i < 16; $i++) {
- $key[0] <<= $shifts[$i];
- $temp = ($key[0] & 0xF0000000) >> 28;
- $key[0] = ($key[0] | $temp) & 0x0FFFFFFF;
-
- $key[1] <<= $shifts[$i];
- $temp = ($key[1] & 0xF0000000) >> 28;
- $key[1] = ($key[1] | $temp) & 0x0FFFFFFF;
-
- $temp = array(
- (($key[1] & 0x00004000) >> 9) | (($key[1] & 0x00000800) >> 7) |
- (($key[1] & 0x00020000) >> 14) | (($key[1] & 0x00000010) >> 2) |
- (($key[1] & 0x08000000) >> 26) | (($key[1] & 0x00800000) >> 23)
- ,
- (($key[1] & 0x02400000) >> 20) | (($key[1] & 0x00000001) << 4) |
- (($key[1] & 0x00002000) >> 10) | (($key[1] & 0x00040000) >> 18) |
- (($key[1] & 0x00000080) >> 6)
- ,
- ( $key[1] & 0x00000020 ) | (($key[1] & 0x00000200) >> 5) |
- (($key[1] & 0x00010000) >> 13) | (($key[1] & 0x01000000) >> 22) |
- (($key[1] & 0x00000004) >> 1) | (($key[1] & 0x00100000) >> 20)
- ,
- (($key[1] & 0x00001000) >> 7) | (($key[1] & 0x00200000) >> 17) |
- (($key[1] & 0x00000002) << 2) | (($key[1] & 0x00000100) >> 6) |
- (($key[1] & 0x00008000) >> 14) | (($key[1] & 0x04000000) >> 26)
- ,
- (($key[0] & 0x00008000) >> 10) | ( $key[0] & 0x00000010 ) |
- (($key[0] & 0x02000000) >> 22) | (($key[0] & 0x00080000) >> 17) |
- (($key[0] & 0x00000200) >> 8) | (($key[0] & 0x00000002) >> 1)
- ,
- (($key[0] & 0x04000000) >> 21) | (($key[0] & 0x00010000) >> 12) |
- (($key[0] & 0x00000020) >> 2) | (($key[0] & 0x00000800) >> 9) |
- (($key[0] & 0x00800000) >> 22) | (($key[0] & 0x00000100) >> 8)
- ,
- (($key[0] & 0x00001000) >> 7) | (($key[0] & 0x00000088) >> 3) |
- (($key[0] & 0x00020000) >> 14) | (($key[0] & 0x00000001) << 2) |
- (($key[0] & 0x00400000) >> 21)
- ,
- (($key[0] & 0x00000400) >> 5) | (($key[0] & 0x00004000) >> 10) |
- (($key[0] & 0x00000040) >> 3) | (($key[0] & 0x00100000) >> 18) |
- (($key[0] & 0x08000000) >> 26) | (($key[0] & 0x01000000) >> 24)
+ for ($des_round = 0; $des_round < $this->des_rounds; ++$des_round) {
+ // pad the key and remove extra characters as appropriate.
+ $key = str_pad(substr($this->key, $des_round * 8, 8), 8, "\0");
+
+ // Perform the PC/1 transformation and compute C and D.
+ $t = unpack('Nl/Nr', $key);
+ list($l, $r) = array($t['l'], $t['r']);
+ $key = ($this->shuffle[$pc1map[ $r & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
+ ($this->shuffle[$pc1map[($r >> 8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
+ ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
+ ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
+ ($this->shuffle[$pc1map[ $l & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
+ ($this->shuffle[$pc1map[($l >> 8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
+ ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
+ ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
+ $key = unpack('Nc/Nd', $key);
+ $c = ( $key['c'] >> 4) & 0x0FFFFFFF;
+ $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F);
+
+ $keys[$des_round] = array(
+ CRYPT_DES_ENCRYPT => array(),
+ CRYPT_DES_DECRYPT => array_fill(0, 32, 0)
);
-
- $keys[] = $temp;
+ for ($i = 0, $ki = 31; $i < 16; ++$i, $ki-= 2) {
+ $c <<= $shifts[$i];
+ $c = ($c | ($c >> 28)) & 0x0FFFFFFF;
+ $d <<= $shifts[$i];
+ $d = ($d | ($d >> 28)) & 0x0FFFFFFF;
+
+ // Perform the PC-2 transformation.
+ $cp = $pc2mapc1[ $c >> 24 ] | $pc2mapc2[($c >> 16) & 0xFF] |
+ $pc2mapc3[($c >> 8) & 0xFF] | $pc2mapc4[ $c & 0xFF];
+ $dp = $pc2mapd1[ $d >> 24 ] | $pc2mapd2[($d >> 16) & 0xFF] |
+ $pc2mapd3[($d >> 8) & 0xFF] | $pc2mapd4[ $d & 0xFF];
+
+ // Reorder: odd bytes/even bytes. Push the result in key schedule.
+ $val1 = ( $cp & 0xFF000000) | (($cp << 8) & 0x00FF0000) |
+ (($dp >> 16) & 0x0000FF00) | (($dp >> 8) & 0x000000FF);
+ $val2 = (($cp << 8) & 0xFF000000) | (($cp << 16) & 0x00FF0000) |
+ (($dp >> 8) & 0x0000FF00) | ( $dp & 0x000000FF);
+ $keys[$des_round][CRYPT_DES_ENCRYPT][ ] = $val1;
+ $keys[$des_round][CRYPT_DES_DECRYPT][$ki - 1] = $val1;
+ $keys[$des_round][CRYPT_DES_ENCRYPT][ ] = $val2;
+ $keys[$des_round][CRYPT_DES_DECRYPT][$ki ] = $val2;
+ }
}
- $temp = array(
- CRYPT_DES_ENCRYPT => $keys,
- CRYPT_DES_DECRYPT => array_reverse($keys)
- );
-
- return $temp;
+ switch ($this->des_rounds) {
+ case 3: // 3DES keys
+ $this->keys = array(
+ CRYPT_DES_ENCRYPT => array_merge(
+ $keys[0][CRYPT_DES_ENCRYPT],
+ $keys[1][CRYPT_DES_DECRYPT],
+ $keys[2][CRYPT_DES_ENCRYPT]
+ ),
+ CRYPT_DES_DECRYPT => array_merge(
+ $keys[2][CRYPT_DES_DECRYPT],
+ $keys[1][CRYPT_DES_ENCRYPT],
+ $keys[0][CRYPT_DES_DECRYPT]
+ )
+ );
+ break;
+ // case 1: // DES keys
+ default:
+ $this->keys = array(
+ CRYPT_DES_ENCRYPT => $keys[0][CRYPT_DES_ENCRYPT],
+ CRYPT_DES_DECRYPT => $keys[0][CRYPT_DES_DECRYPT]
+ );
+ }
}
/**
- * String Shift
- *
- * Inspired by array_shift
+ * Setup the performance-optimized function for de/encrypt()
*
- * @param String $string
- * @param optional Integer $index
- * @return String
+ * @see Crypt_Base::_setupInlineCrypt()
* @access private
*/
- function _string_shift(&$string, $index = 1)
+ function _setupInlineCrypt()
{
- $substr = substr($string, 0, $index);
- $string = substr($string, $index);
- return $substr;
+ $lambda_functions =& Crypt_DES::_getLambdaFunctions();
+
+ // Engine configuration for:
+ // - DES ($des_rounds == 1) or
+ // - 3DES ($des_rounds == 3)
+ $des_rounds = $this->des_rounds;
+
+ // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
+ // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one
+ $gen_hi_opt_code = (bool)( count($lambda_functions) < 10 );
+
+ // Generation of a uniqe hash for our generated code
+ switch (true) {
+ case $gen_hi_opt_code:
+ // For hi-optimized code, we create for each combination of
+ // $mode, $des_rounds and $this->key its own encrypt/decrypt function.
+ $code_hash = md5(str_pad("Crypt_DES, $des_rounds, {$this->mode}, ", 32, "\0") . $this->key);
+ break;
+ default:
+ // After max 10 hi-optimized functions, we create generic
+ // (still very fast.. but not ultra) functions for each $mode/$des_rounds
+ // Currently 2 * 5 generic functions will be then max. possible.
+ $code_hash = "Crypt_DES, $des_rounds, {$this->mode}";
+ }
+
+ // Is there a re-usable $lambda_functions in there? If not, we have to create it.
+ if (!isset($lambda_functions[$code_hash])) {
+ // Init code for both, encrypt and decrypt.
+ $init_crypt = 'static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
+ if (!$sbox1) {
+ $sbox1 = array_map("intval", $self->sbox1);
+ $sbox2 = array_map("intval", $self->sbox2);
+ $sbox3 = array_map("intval", $self->sbox3);
+ $sbox4 = array_map("intval", $self->sbox4);
+ $sbox5 = array_map("intval", $self->sbox5);
+ $sbox6 = array_map("intval", $self->sbox6);
+ $sbox7 = array_map("intval", $self->sbox7);
+ $sbox8 = array_map("intval", $self->sbox8);'
+ /* Merge $shuffle with $[inv]ipmap */ . '
+ for ($i = 0; $i < 256; ++$i) {
+ $shuffleip[] = $self->shuffle[$self->ipmap[$i]];
+ $shuffleinvip[] = $self->shuffle[$self->invipmap[$i]];
+ }
+ }
+ ';
+
+ switch (true) {
+ case $gen_hi_opt_code:
+ // In Hi-optimized code mode, we use our [3]DES key schedule as hardcoded integers.
+ // No futher initialisation of the $keys schedule is necessary.
+ // That is the extra performance boost.
+ $k = array(
+ CRYPT_DES_ENCRYPT => $this->keys[CRYPT_DES_ENCRYPT],
+ CRYPT_DES_DECRYPT => $this->keys[CRYPT_DES_DECRYPT]
+ );
+ $init_encrypt = '';
+ $init_decrypt = '';
+ break;
+ default:
+ // In generic optimized code mode, we have to use, as the best compromise [currently],
+ // our key schedule as $ke/$kd arrays. (with hardcoded indexes...)
+ $k = array(
+ CRYPT_DES_ENCRYPT => array(),
+ CRYPT_DES_DECRYPT => array()
+ );
+ for ($i = 0, $c = count($this->keys[CRYPT_DES_ENCRYPT]); $i < $c; ++$i) {
+ $k[CRYPT_DES_ENCRYPT][$i] = '$ke[' . $i . ']';
+ $k[CRYPT_DES_DECRYPT][$i] = '$kd[' . $i . ']';
+ }
+ $init_encrypt = '$ke = $self->keys[CRYPT_DES_ENCRYPT];';
+ $init_decrypt = '$kd = $self->keys[CRYPT_DES_DECRYPT];';
+ break;
+ }
+
+ // Creating code for en- and decryption.
+ $crypt_block = array();
+ foreach (array(CRYPT_DES_ENCRYPT, CRYPT_DES_DECRYPT) as $c) {
+
+ /* Do the initial IP permutation. */
+ $crypt_block[$c] = '
+ $in = unpack("N*", $in);
+ $l = $in[1];
+ $r = $in[2];
+ $in = unpack("N*",
+ ($shuffleip[ $r & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+ ($shuffleip[($r >> 8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+ ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+ ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+ ($shuffleip[ $l & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+ ($shuffleip[($l >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+ ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+ ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01")
+ );
+ ' . /* Extract L0 and R0 */ '
+ $l = $in[1];
+ $r = $in[2];
+ ';
+
+ $l = '$l';
+ $r = '$r';
+
+ // Perform DES or 3DES.
+ for ($ki = -1, $des_round = 0; $des_round < $des_rounds; ++$des_round) {
+ // Perform the 16 steps.
+ for ($i = 0; $i < 16; ++$i) {
+ // start of "the Feistel (F) function" - see the following URL:
+ // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
+ // Merge key schedule.
+ $crypt_block[$c].= '
+ $b1 = ((' . $r . ' >> 3) & 0x1FFFFFFF) ^ (' . $r . ' << 29) ^ ' . $k[$c][++$ki] . ';
+ $b2 = ((' . $r . ' >> 31) & 0x00000001) ^ (' . $r . ' << 1) ^ ' . $k[$c][++$ki] . ';' .
+ /* S-box indexing. */
+ $l . ' = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+ $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
+ $sbox5[($b1 >> 8) & 0x3F] ^ $sbox6[($b2 >> 8) & 0x3F] ^
+ $sbox7[ $b1 & 0x3F] ^ $sbox8[ $b2 & 0x3F] ^ ' . $l . ';
+ ';
+ // end of "the Feistel (F) function"
+
+ // swap L & R
+ list($l, $r) = array($r, $l);
+ }
+ list($l, $r) = array($r, $l);
+ }
+
+ // Perform the inverse IP permutation.
+ $crypt_block[$c].= '$in =
+ ($shuffleinvip[($l >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+ ($shuffleinvip[($r >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+ ($shuffleinvip[($l >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+ ($shuffleinvip[($r >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+ ($shuffleinvip[($l >> 8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+ ($shuffleinvip[($r >> 8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+ ($shuffleinvip[ $l & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+ ($shuffleinvip[ $r & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+ ';
+ }
+
+ // Creates the inline-crypt function
+ $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+ array(
+ 'init_crypt' => $init_crypt,
+ 'init_encrypt' => $init_encrypt,
+ 'init_decrypt' => $init_decrypt,
+ 'encrypt_block' => $crypt_block[CRYPT_DES_ENCRYPT],
+ 'decrypt_block' => $crypt_block[CRYPT_DES_DECRYPT]
+ )
+ );
+ }
+
+ // Set the inline-crypt function as callback in: $this->inline_crypt
+ $this->inline_crypt = $lambda_functions[$code_hash];
}
}
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/vendor/phpseclib/Crypt/Hash.php b/vendor/phpseclib/Crypt/Hash.php
index 3eda500465..fb9df22573 100644
--- a/vendor/phpseclib/Crypt/Hash.php
+++ b/vendor/phpseclib/Crypt/Hash.php
@@ -21,7 +21,7 @@
* Here's a short example of how to use this library:
*
*
- * @copyright MMVII Jim Wigginton
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @version $Id: Hash.php,v 1.6 2009/11/23 23:37:07 terrafrost Exp $
- * @link http://phpseclib.sourceforge.net
+ * @category Crypt
+ * @package Crypt_Hash
+ * @author Jim Wigginton
+ * @copyright MMVII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
*/
+use \PHPSecLib\Math\BigInteger;
+
/**#@+
* @access private
- * @see Crypt_Hash::Crypt_Hash()
+ * @see Crypt_Hash::__construct()
*/
/**
* Toggles the internal implementation
@@ -79,12 +80,21 @@
/**
* Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
*
+ * @package Crypt_Hash
* @author Jim Wigginton
- * @version 0.1.0
* @access public
- * @package Crypt_Hash
*/
-class Crypt_Hash {
+class Crypt_Hash
+{
+ /**
+ * Hash Parameter
+ *
+ * @see Crypt_Hash::setHash()
+ * @var Integer
+ * @access private
+ */
+ var $hashParam;
+
/**
* Byte-length of compression blocks / key (Internal HMAC)
*
@@ -119,7 +129,7 @@ class Crypt_Hash {
* @var String
* @access private
*/
- var $key = '';
+ var $key = false;
/**
* Outer XOR (Internal HMAC)
@@ -170,13 +180,26 @@ function __construct($hash = 'sha1')
* Keys can be of any length.
*
* @access public
- * @param String $key
+ * @param optional String $key
*/
- function setKey($key)
+ function setKey($key = false)
{
$this->key = $key;
}
+ /**
+ * Gets the hash function.
+ *
+ * As set by the constructor or by the setHash() method.
+ *
+ * @access public
+ * @return String
+ */
+ function getHash()
+ {
+ return $this->hashParam;
+ }
+
/**
* Sets the hash function.
*
@@ -185,6 +208,7 @@ function setKey($key)
*/
function setHash($hash)
{
+ $this->hashParam = $hash = strtolower($hash);
switch ($hash) {
case 'md5-96':
case 'sha1-96':
@@ -297,7 +321,7 @@ function hash($text)
{
$mode = is_array($this->hash) ? CRYPT_HASH_MODE_INTERNAL : CRYPT_HASH_MODE;
- if (!empty($this->key)) {
+ if (!empty($this->key) || is_string($this->key)) {
switch ( $mode ) {
case CRYPT_HASH_MODE_MHASH:
$output = mhash($this->hash, $text, $this->key);
@@ -347,46 +371,11 @@ function getLength()
return $this->l;
}
- /* PBKDF2 Implementation (described in RFC 2898)
- *
- * @param string p password
- * @param string s salt
- * @param int c iteration count (use 1000 or higher)
- * @param int kl derived key length
- * @param string a hash algorithm
- *
- * @return string derived key
- */
- public function pbkdf2( $p, $s, $c, $kl, $a = 'sha256' )
- {
- $hl = strlen(hash($a, null, true)); # Hash length
- $kb = ceil($kl / $hl); # Key blocks to compute
- $dk = ''; # Derived key
-
- # Create key
- for ( $block = 1; $block <= $kb; $block ++ )
- {
- # Initial hash for this block
- $ib = $b = hash_hmac($a, $s . pack('N', $block), $p, true);
-
- # Perform block iterations
- for ( $i = 1; $i < $c; $i ++ )
- {
- # XOR each iterate
- $ib ^= ($b = hash_hmac($a, $b, $p, true));
- }
- $dk .= $ib; # Append iterated block
- }
-
- # Return derived key of correct length
- return substr($dk, 0, $kl);
- }
-
/**
* Wrapper for MD5
*
* @access private
- * @param String $text
+ * @param String $m
*/
function _md5($m)
{
@@ -397,7 +386,7 @@ function _md5($m)
* Wrapper for SHA1
*
* @access private
- * @param String $text
+ * @param String $m
*/
function _sha1($m)
{
@@ -410,7 +399,7 @@ function _sha1($m)
* See {@link http://tools.ietf.org/html/rfc1319 RFC1319}.
*
* @access private
- * @param String $text
+ * @param String $m
*/
function _md2($m)
{
@@ -486,7 +475,7 @@ function _md2($m)
* See {@link http://en.wikipedia.org/wiki/SHA_hash_functions#SHA-256_.28a_SHA-2_variant.29_pseudocode SHA-256 (a SHA-2 variant) pseudocode - Wikipedia}.
*
* @access private
- * @param String $text
+ * @param String $m
*/
function _sha256($m)
{
@@ -591,7 +580,7 @@ function _sha256($m)
* Pure-PHP implementation of SHA384 and SHA512
*
* @access private
- * @param String $text
+ * @param String $m
*/
function _sha512($m)
{
@@ -609,9 +598,9 @@ function _sha512($m)
);
for ($i = 0; $i < 8; $i++) {
- $init384[$i] = new Math_BigInteger($init384[$i], 16);
+ $init384[$i] = new BigInteger($init384[$i], 16);
$init384[$i]->setPrecision(64);
- $init512[$i] = new Math_BigInteger($init512[$i], 16);
+ $init512[$i] = new BigInteger($init512[$i], 16);
$init512[$i]->setPrecision(64);
}
@@ -641,7 +630,7 @@ function _sha512($m)
);
for ($i = 0; $i < 80; $i++) {
- $k[$i] = new Math_BigInteger($k[$i], 16);
+ $k[$i] = new BigInteger($k[$i], 16);
}
}
@@ -660,7 +649,7 @@ function _sha512($m)
foreach ($chunks as $chunk) {
$w = array();
for ($i = 0; $i < 16; $i++) {
- $temp = new Math_BigInteger($this->_string_shift($chunk, 8), 256);
+ $temp = new BigInteger($this->_string_shift($chunk, 8), 256);
$temp->setPrecision(64);
$w[] = $temp;
}
@@ -814,11 +803,10 @@ function _not($int)
* Add
*
* _sha256() adds multiple unsigned 32-bit integers. Since PHP doesn't support unsigned integers and since the
- * possibility of overflow exists, care has to be taken. Math_BigInteger() could be used but this should be faster.
+ * possibility of overflow exists, care has to be taken. BigInteger could be used but this should be faster.
*
- * @param String $string
- * @param optional Integer $index
- * @return String
+ * @param Integer $...
+ * @return Integer
* @see _sha256()
* @access private
*/
@@ -854,4 +842,40 @@ function _string_shift(&$string, $index = 1)
$string = substr($string, $index);
return $substr;
}
+
+ /* PBKDF2 Implementation (described in RFC 2898)
+ *
+ * @param string p password
+ * @param string s salt
+ * @param int c iteration count (use 1000 or higher)
+ * @param int kl derived key length
+ * @param string a hash algorithm
+ *
+ * @return string derived key
+ */
+ public function pbkdf2( $p, $s, $c, $kl, $a = 'sha256' )
+ {
+ $hl = strlen(hash($a, null, true)); # Hash length
+ $kb = ceil($kl / $hl); # Key blocks to compute
+ $dk = ''; # Derived key
+
+ # Create key
+ for ( $block = 1; $block <= $kb; $block ++ )
+ {
+ # Initial hash for this block
+ $ib = $b = hash_hmac($a, $s . pack('N', $block), $p, true);
+
+ # Perform block iterations
+ for ( $i = 1; $i < $c; $i ++ )
+ {
+ # XOR each iterate
+ $ib ^= ($b = hash_hmac($a, $b, $p, true));
+ }
+ $dk .= $ib; # Append iterated block
+ }
+
+ # Return derived key of correct length
+ return substr($dk, 0, $kl);
+ }
+
}
diff --git a/vendor/phpseclib/Crypt/RC2.php b/vendor/phpseclib/Crypt/RC2.php
new file mode 100644
index 0000000000..361420185f
--- /dev/null
+++ b/vendor/phpseclib/Crypt/RC2.php
@@ -0,0 +1,651 @@
+
+ * setKey('abcdefgh');
+ *
+ * $plaintext = str_repeat('a', 1024);
+ *
+ * echo $rc2->decrypt($rc2->encrypt($plaintext));
+ * ?>
+ *
+ *
+ * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @category Crypt
+ * @package Crypt_RC2
+ * @author Patrick Monnerat
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
+ */
+
+/**
+ * Make sure we have the base loaded
+ */
+class_exists('PHPSecLib\Crypt_Base');
+
+/**#@+
+ * @access public
+ * @see Crypt_RC2::encrypt()
+ * @see Crypt_RC2::decrypt()
+ */
+/**
+ * Encrypt / decrypt using the Counter mode.
+ *
+ * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+ */
+define('CRYPT_RC2_MODE_CTR', CRYPT_MODE_CTR);
+/**
+ * Encrypt / decrypt using the Electronic Code Book mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+ */
+define('CRYPT_RC2_MODE_ECB', CRYPT_MODE_ECB);
+/**
+ * Encrypt / decrypt using the Code Book Chaining mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+ */
+define('CRYPT_RC2_MODE_CBC', CRYPT_MODE_CBC);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+ */
+define('CRYPT_RC2_MODE_CFB', CRYPT_MODE_CFB);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+ */
+define('CRYPT_RC2_MODE_OFB', CRYPT_MODE_OFB);
+/**#@-*/
+
+/**#@+
+ * @access private
+ * @see Crypt_RC2::__construct()
+ */
+/**
+ * Toggles the internal implementation
+ */
+define('CRYPT_RC2_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
+/**
+ * Toggles the mcrypt implementation
+ */
+define('CRYPT_RC2_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
+/**#@-*/
+
+/**
+ * Pure-PHP implementation of RC2.
+ *
+ * @package Crypt_RC2
+ * @access public
+ */
+class Crypt_RC2 extends Crypt_Base
+{
+ /**
+ * Block Length of the cipher
+ *
+ * @see Crypt_Base::block_size
+ * @var Integer
+ * @access private
+ */
+ var $block_size = 8;
+
+ /**
+ * The Key
+ *
+ * @see Crypt_Base::key
+ * @see setKey()
+ * @var String
+ * @access private
+ */
+ var $key = "\0";
+
+ /**
+ * The default password key_size used by setPassword()
+ *
+ * @see Crypt_Base::password_key_size
+ * @see Crypt_Base::setPassword()
+ * @var Integer
+ * @access private
+ */
+ var $password_key_size = 16; // = 128 bits
+
+ /**
+ * The namespace used by the cipher for its constants.
+ *
+ * @see Crypt_Base::const_namespace
+ * @var String
+ * @access private
+ */
+ var $const_namespace = 'RC2';
+
+ /**
+ * The mcrypt specific name of the cipher
+ *
+ * @see Crypt_Base::cipher_name_mcrypt
+ * @var String
+ * @access private
+ */
+ var $cipher_name_mcrypt = 'rc2';
+
+ /**
+ * Optimizing value while CFB-encrypting
+ *
+ * @see Crypt_Base::cfb_init_len
+ * @var Integer
+ * @access private
+ */
+ var $cfb_init_len = 500;
+
+ /**
+ * The key length in bits.
+ *
+ * @see Crypt_RC2::setKeyLength()
+ * @see Crypt_RC2::setKey()
+ * @var Integer
+ * @access private
+ * @internal Should be in range [1..1024].
+ * @internal Changing this value after setting the key has no effect.
+ */
+ var $default_key_length = 1024;
+
+ /**
+ * The Key Schedule
+ *
+ * @see Crypt_RC2::_setupKey()
+ * @var Array
+ * @access private
+ */
+ var $keys;
+
+ /**
+ * Key expansion randomization table.
+ * Twice the same 256-value sequence to save a modulus in key expansion.
+ *
+ * @see Crypt_RC2::setKey()
+ * @var Array
+ * @access private
+ */
+ var $pitable = array(
+ 0xD9, 0x78, 0xF9, 0xC4, 0x19, 0xDD, 0xB5, 0xED,
+ 0x28, 0xE9, 0xFD, 0x79, 0x4A, 0xA0, 0xD8, 0x9D,
+ 0xC6, 0x7E, 0x37, 0x83, 0x2B, 0x76, 0x53, 0x8E,
+ 0x62, 0x4C, 0x64, 0x88, 0x44, 0x8B, 0xFB, 0xA2,
+ 0x17, 0x9A, 0x59, 0xF5, 0x87, 0xB3, 0x4F, 0x13,
+ 0x61, 0x45, 0x6D, 0x8D, 0x09, 0x81, 0x7D, 0x32,
+ 0xBD, 0x8F, 0x40, 0xEB, 0x86, 0xB7, 0x7B, 0x0B,
+ 0xF0, 0x95, 0x21, 0x22, 0x5C, 0x6B, 0x4E, 0x82,
+ 0x54, 0xD6, 0x65, 0x93, 0xCE, 0x60, 0xB2, 0x1C,
+ 0x73, 0x56, 0xC0, 0x14, 0xA7, 0x8C, 0xF1, 0xDC,
+ 0x12, 0x75, 0xCA, 0x1F, 0x3B, 0xBE, 0xE4, 0xD1,
+ 0x42, 0x3D, 0xD4, 0x30, 0xA3, 0x3C, 0xB6, 0x26,
+ 0x6F, 0xBF, 0x0E, 0xDA, 0x46, 0x69, 0x07, 0x57,
+ 0x27, 0xF2, 0x1D, 0x9B, 0xBC, 0x94, 0x43, 0x03,
+ 0xF8, 0x11, 0xC7, 0xF6, 0x90, 0xEF, 0x3E, 0xE7,
+ 0x06, 0xC3, 0xD5, 0x2F, 0xC8, 0x66, 0x1E, 0xD7,
+ 0x08, 0xE8, 0xEA, 0xDE, 0x80, 0x52, 0xEE, 0xF7,
+ 0x84, 0xAA, 0x72, 0xAC, 0x35, 0x4D, 0x6A, 0x2A,
+ 0x96, 0x1A, 0xD2, 0x71, 0x5A, 0x15, 0x49, 0x74,
+ 0x4B, 0x9F, 0xD0, 0x5E, 0x04, 0x18, 0xA4, 0xEC,
+ 0xC2, 0xE0, 0x41, 0x6E, 0x0F, 0x51, 0xCB, 0xCC,
+ 0x24, 0x91, 0xAF, 0x50, 0xA1, 0xF4, 0x70, 0x39,
+ 0x99, 0x7C, 0x3A, 0x85, 0x23, 0xB8, 0xB4, 0x7A,
+ 0xFC, 0x02, 0x36, 0x5B, 0x25, 0x55, 0x97, 0x31,
+ 0x2D, 0x5D, 0xFA, 0x98, 0xE3, 0x8A, 0x92, 0xAE,
+ 0x05, 0xDF, 0x29, 0x10, 0x67, 0x6C, 0xBA, 0xC9,
+ 0xD3, 0x00, 0xE6, 0xCF, 0xE1, 0x9E, 0xA8, 0x2C,
+ 0x63, 0x16, 0x01, 0x3F, 0x58, 0xE2, 0x89, 0xA9,
+ 0x0D, 0x38, 0x34, 0x1B, 0xAB, 0x33, 0xFF, 0xB0,
+ 0xBB, 0x48, 0x0C, 0x5F, 0xB9, 0xB1, 0xCD, 0x2E,
+ 0xC5, 0xF3, 0xDB, 0x47, 0xE5, 0xA5, 0x9C, 0x77,
+ 0x0A, 0xA6, 0x20, 0x68, 0xFE, 0x7F, 0xC1, 0xAD,
+ 0xD9, 0x78, 0xF9, 0xC4, 0x19, 0xDD, 0xB5, 0xED,
+ 0x28, 0xE9, 0xFD, 0x79, 0x4A, 0xA0, 0xD8, 0x9D,
+ 0xC6, 0x7E, 0x37, 0x83, 0x2B, 0x76, 0x53, 0x8E,
+ 0x62, 0x4C, 0x64, 0x88, 0x44, 0x8B, 0xFB, 0xA2,
+ 0x17, 0x9A, 0x59, 0xF5, 0x87, 0xB3, 0x4F, 0x13,
+ 0x61, 0x45, 0x6D, 0x8D, 0x09, 0x81, 0x7D, 0x32,
+ 0xBD, 0x8F, 0x40, 0xEB, 0x86, 0xB7, 0x7B, 0x0B,
+ 0xF0, 0x95, 0x21, 0x22, 0x5C, 0x6B, 0x4E, 0x82,
+ 0x54, 0xD6, 0x65, 0x93, 0xCE, 0x60, 0xB2, 0x1C,
+ 0x73, 0x56, 0xC0, 0x14, 0xA7, 0x8C, 0xF1, 0xDC,
+ 0x12, 0x75, 0xCA, 0x1F, 0x3B, 0xBE, 0xE4, 0xD1,
+ 0x42, 0x3D, 0xD4, 0x30, 0xA3, 0x3C, 0xB6, 0x26,
+ 0x6F, 0xBF, 0x0E, 0xDA, 0x46, 0x69, 0x07, 0x57,
+ 0x27, 0xF2, 0x1D, 0x9B, 0xBC, 0x94, 0x43, 0x03,
+ 0xF8, 0x11, 0xC7, 0xF6, 0x90, 0xEF, 0x3E, 0xE7,
+ 0x06, 0xC3, 0xD5, 0x2F, 0xC8, 0x66, 0x1E, 0xD7,
+ 0x08, 0xE8, 0xEA, 0xDE, 0x80, 0x52, 0xEE, 0xF7,
+ 0x84, 0xAA, 0x72, 0xAC, 0x35, 0x4D, 0x6A, 0x2A,
+ 0x96, 0x1A, 0xD2, 0x71, 0x5A, 0x15, 0x49, 0x74,
+ 0x4B, 0x9F, 0xD0, 0x5E, 0x04, 0x18, 0xA4, 0xEC,
+ 0xC2, 0xE0, 0x41, 0x6E, 0x0F, 0x51, 0xCB, 0xCC,
+ 0x24, 0x91, 0xAF, 0x50, 0xA1, 0xF4, 0x70, 0x39,
+ 0x99, 0x7C, 0x3A, 0x85, 0x23, 0xB8, 0xB4, 0x7A,
+ 0xFC, 0x02, 0x36, 0x5B, 0x25, 0x55, 0x97, 0x31,
+ 0x2D, 0x5D, 0xFA, 0x98, 0xE3, 0x8A, 0x92, 0xAE,
+ 0x05, 0xDF, 0x29, 0x10, 0x67, 0x6C, 0xBA, 0xC9,
+ 0xD3, 0x00, 0xE6, 0xCF, 0xE1, 0x9E, 0xA8, 0x2C,
+ 0x63, 0x16, 0x01, 0x3F, 0x58, 0xE2, 0x89, 0xA9,
+ 0x0D, 0x38, 0x34, 0x1B, 0xAB, 0x33, 0xFF, 0xB0,
+ 0xBB, 0x48, 0x0C, 0x5F, 0xB9, 0xB1, 0xCD, 0x2E,
+ 0xC5, 0xF3, 0xDB, 0x47, 0xE5, 0xA5, 0x9C, 0x77,
+ 0x0A, 0xA6, 0x20, 0x68, 0xFE, 0x7F, 0xC1, 0xAD
+ );
+
+ /**
+ * Inverse key expansion randomization table.
+ *
+ * @see Crypt_RC2::setKey()
+ * @var Array
+ * @access private
+ */
+ var $invpitable = array(
+ 0xD1, 0xDA, 0xB9, 0x6F, 0x9C, 0xC8, 0x78, 0x66,
+ 0x80, 0x2C, 0xF8, 0x37, 0xEA, 0xE0, 0x62, 0xA4,
+ 0xCB, 0x71, 0x50, 0x27, 0x4B, 0x95, 0xD9, 0x20,
+ 0x9D, 0x04, 0x91, 0xE3, 0x47, 0x6A, 0x7E, 0x53,
+ 0xFA, 0x3A, 0x3B, 0xB4, 0xA8, 0xBC, 0x5F, 0x68,
+ 0x08, 0xCA, 0x8F, 0x14, 0xD7, 0xC0, 0xEF, 0x7B,
+ 0x5B, 0xBF, 0x2F, 0xE5, 0xE2, 0x8C, 0xBA, 0x12,
+ 0xE1, 0xAF, 0xB2, 0x54, 0x5D, 0x59, 0x76, 0xDB,
+ 0x32, 0xA2, 0x58, 0x6E, 0x1C, 0x29, 0x64, 0xF3,
+ 0xE9, 0x96, 0x0C, 0x98, 0x19, 0x8D, 0x3E, 0x26,
+ 0xAB, 0xA5, 0x85, 0x16, 0x40, 0xBD, 0x49, 0x67,
+ 0xDC, 0x22, 0x94, 0xBB, 0x3C, 0xC1, 0x9B, 0xEB,
+ 0x45, 0x28, 0x18, 0xD8, 0x1A, 0x42, 0x7D, 0xCC,
+ 0xFB, 0x65, 0x8E, 0x3D, 0xCD, 0x2A, 0xA3, 0x60,
+ 0xAE, 0x93, 0x8A, 0x48, 0x97, 0x51, 0x15, 0xF7,
+ 0x01, 0x0B, 0xB7, 0x36, 0xB1, 0x2E, 0x11, 0xFD,
+ 0x84, 0x2D, 0x3F, 0x13, 0x88, 0xB3, 0x34, 0x24,
+ 0x1B, 0xDE, 0xC5, 0x1D, 0x4D, 0x2B, 0x17, 0x31,
+ 0x74, 0xA9, 0xC6, 0x43, 0x6D, 0x39, 0x90, 0xBE,
+ 0xC3, 0xB0, 0x21, 0x6B, 0xF6, 0x0F, 0xD5, 0x99,
+ 0x0D, 0xAC, 0x1F, 0x5C, 0x9E, 0xF5, 0xF9, 0x4C,
+ 0xD6, 0xDF, 0x89, 0xE4, 0x8B, 0xFF, 0xC7, 0xAA,
+ 0xE7, 0xED, 0x46, 0x25, 0xB6, 0x06, 0x5E, 0x35,
+ 0xB5, 0xEC, 0xCE, 0xE8, 0x6C, 0x30, 0x55, 0x61,
+ 0x4A, 0xFE, 0xA0, 0x79, 0x03, 0xF0, 0x10, 0x72,
+ 0x7C, 0xCF, 0x52, 0xA6, 0xA7, 0xEE, 0x44, 0xD3,
+ 0x9A, 0x57, 0x92, 0xD0, 0x5A, 0x7A, 0x41, 0x7F,
+ 0x0E, 0x00, 0x63, 0xF2, 0x4F, 0x05, 0x83, 0xC9,
+ 0xA1, 0xD4, 0xDD, 0xC4, 0x56, 0xF4, 0xD2, 0x77,
+ 0x81, 0x09, 0x82, 0x33, 0x9F, 0x07, 0x86, 0x75,
+ 0x38, 0x4E, 0x69, 0xF1, 0xAD, 0x23, 0x73, 0x87,
+ 0x70, 0x02, 0xC2, 0x1E, 0xB8, 0x0A, 0xFC, 0xE6
+ );
+
+ /**
+ * Default Constructor.
+ *
+ * Determines whether or not the mcrypt extension should be used.
+ *
+ * $mode could be:
+ *
+ * - CRYPT_RC2_MODE_ECB
+ *
+ * - CRYPT_RC2_MODE_CBC
+ *
+ * - CRYPT_RC2_MODE_CTR
+ *
+ * - CRYPT_RC2_MODE_CFB
+ *
+ * - CRYPT_RC2_MODE_OFB
+ *
+ * If not explicitly set, CRYPT_RC2_MODE_CBC will be used.
+ *
+ * @see Crypt_Base::__construct()
+ * @param optional Integer $mode
+ * @access public
+ */
+ function __construct($mode = CRYPT_RC2_MODE_CBC)
+ {
+ parent::__construct($mode);
+ $this->setKey('');
+ }
+
+ /**
+ * Sets the key length
+ *
+ * Valid key lengths are 1 to 1024.
+ * Calling this function after setting the key has no effect until the next
+ * Crypt_RC2::setKey() call.
+ *
+ * @access public
+ * @param Integer $length in bits
+ */
+ function setKeyLength($length)
+ {
+ if ($length >= 1 && $length <= 1024) {
+ $this->default_key_length = $length;
+ }
+ }
+
+ /**
+ * Sets the key.
+ *
+ * Keys can be of any length. RC2, itself, uses 1 to 1024 bit keys (eg.
+ * strlen($key) <= 128), however, we only use the first 128 bytes if $key
+ * has more then 128 bytes in it, and set $key to a single null byte if
+ * it is empty.
+ *
+ * If the key is not explicitly set, it'll be assumed to be a single
+ * null byte.
+ *
+ * @see Crypt_Base::setKey()
+ * @access public
+ * @param String $key
+ * @param Integer $t1 optional Effective key length in bits.
+ */
+ function setKey($key, $t1 = 0)
+ {
+ if ($t1 <= 0) {
+ $t1 = $this->default_key_length;
+ } else if ($t1 > 1024) {
+ $t1 = 1024;
+ }
+ // Key byte count should be 1..128.
+ $key = strlen($key) ? substr($key, 0, 128) : "\x00";
+ $t = strlen($key);
+
+ // The mcrypt RC2 implementation only supports effective key length
+ // of 1024 bits. It is however possible to handle effective key
+ // lengths in range 1..1024 by expanding the key and applying
+ // inverse pitable mapping to the first byte before submitting it
+ // to mcrypt.
+
+ // Key expansion.
+ $l = array_values(unpack('C*', $key));
+ $t8 = ($t1 + 7) >> 3;
+ $tm = 0xFF >> (8 * $t8 - $t1);
+
+ // Expand key.
+ $pitable = $this->pitable;
+ for ($i = $t; $i < 128; $i++) {
+ $l[$i] = $pitable[$l[$i - 1] + $l[$i - $t]];
+ }
+ $i = 128 - $t8;
+ $l[$i] = $pitable[$l[$i] & $tm];
+ while ($i--) {
+ $l[$i] = $pitable[$l[$i + 1] ^ $l[$i + $t8]];
+ }
+
+ // Prepare the key for mcrypt.
+ $l[0] = $this->invpitable[$l[0]];
+ array_unshift($l, 'C*');
+ parent::setKey(call_user_func_array('pack', $l));
+ }
+
+ /**
+ * Encrypts a block
+ *
+ * @see Crypt_Base::_encryptBlock()
+ * @see Crypt_Base::encrypt()
+ * @access private
+ * @param String $in
+ * @return String
+ */
+ function _encryptBlock($in)
+ {
+ list($r0, $r1, $r2, $r3) = array_values(unpack('v*', $in));
+ $keys = $this->keys;
+ $limit = 20;
+ $actions = array($limit => 44, 44 => 64);
+ $j = 0;
+
+ for (;;) {
+ // Mixing round.
+ $r0 = (($r0 + $keys[$j++] + ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF) << 1;
+ $r0 |= $r0 >> 16;
+ $r1 = (($r1 + $keys[$j++] + ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF) << 2;
+ $r1 |= $r1 >> 16;
+ $r2 = (($r2 + $keys[$j++] + ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF) << 3;
+ $r2 |= $r2 >> 16;
+ $r3 = (($r3 + $keys[$j++] + ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF) << 5;
+ $r3 |= $r3 >> 16;
+
+ if ($j === $limit) {
+ if ($limit === 64) {
+ break;
+ }
+
+ // Mashing round.
+ $r0 += $keys[$r3 & 0x3F];
+ $r1 += $keys[$r0 & 0x3F];
+ $r2 += $keys[$r1 & 0x3F];
+ $r3 += $keys[$r2 & 0x3F];
+ $limit = $actions[$limit];
+ }
+ }
+
+ return pack('vvvv', $r0, $r1, $r2, $r3);
+ }
+
+ /**
+ * Decrypts a block
+ *
+ * @see Crypt_Base::_decryptBlock()
+ * @see Crypt_Base::decrypt()
+ * @access private
+ * @param String $in
+ * @return String
+ */
+ function _decryptBlock($in)
+ {
+ list($r0, $r1, $r2, $r3) = array_values(unpack('v*', $in));
+ $keys = $this->keys;
+ $limit = 44;
+ $actions = array($limit => 20, 20 => 0);
+ $j = 64;
+
+ for (;;) {
+ // R-mixing round.
+ $r3 = ($r3 | ($r3 << 16)) >> 5;
+ $r3 = ($r3 - $keys[--$j] - ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF;
+ $r2 = ($r2 | ($r2 << 16)) >> 3;
+ $r2 = ($r2 - $keys[--$j] - ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF;
+ $r1 = ($r1 | ($r1 << 16)) >> 2;
+ $r1 = ($r1 - $keys[--$j] - ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF;
+ $r0 = ($r0 | ($r0 << 16)) >> 1;
+ $r0 = ($r0 - $keys[--$j] - ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF;
+
+ if ($j === $limit) {
+ if ($limit === 0) {
+ break;
+ }
+
+ // R-mashing round.
+ $r3 = ($r3 - $keys[$r2 & 0x3F]) & 0xFFFF;
+ $r2 = ($r2 - $keys[$r1 & 0x3F]) & 0xFFFF;
+ $r1 = ($r1 - $keys[$r0 & 0x3F]) & 0xFFFF;
+ $r0 = ($r0 - $keys[$r3 & 0x3F]) & 0xFFFF;
+ $limit = $actions[$limit];
+ }
+ }
+
+ return pack('vvvv', $r0, $r1, $r2, $r3);
+ }
+
+ /**
+ * Creates the key schedule
+ *
+ * @see Crypt_Base::_setupKey()
+ * @access private
+ */
+ function _setupKey()
+ {
+ // Key has already been expanded in Crypt_RC2::setKey():
+ // Only the first value must be altered.
+ $l = unpack('Ca/Cb/v*', $this->key);
+ array_unshift($l, $this->pitable[$l['a']] | ($l['b'] << 8));
+ unset($l['a']);
+ unset($l['b']);
+ $this->keys = $l;
+ }
+
+ /**
+ * Setup the performance-optimized function for de/encrypt()
+ *
+ * @see Crypt_Base::_setupInlineCrypt()
+ * @access private
+ */
+ function _setupInlineCrypt()
+ {
+ $lambda_functions = &Crypt_RC2::_getLambdaFunctions();
+
+ // The first 10 generated $lambda_functions will use the $keys hardcoded as integers
+ // for the mixing rounds, for better inline crypt performance [~20% faster].
+ // But for memory reason we have to limit those ultra-optimized $lambda_functions to an amount of 10.
+ $keys = $this->keys;
+ if (count($lambda_functions) >= 10) {
+ foreach ($this->keys as $k => $v) {
+ $keys[$k] = '$keys[' . $k . ']';
+ }
+ }
+
+ $code_hash = md5(str_pad("Crypt_RC2, {$this->mode}, ", 32, "\0") . implode(',', $keys));
+
+ // Is there a re-usable $lambda_functions in there?
+ // If not, we have to create it.
+ if (!isset($lambda_functions[$code_hash])) {
+ // Init code for both, encrypt and decrypt.
+ $init_crypt = '$keys = $self->keys;';
+
+ // $in is the current 8 bytes block which has to be en/decrypt
+ $encrypt_block = $decrypt_block = '
+ $in = unpack("v4", $in);
+ $r0 = $in[1];
+ $r1 = $in[2];
+ $r2 = $in[3];
+ $r3 = $in[4];
+ ';
+
+ // Create code for encryption.
+ $limit = 20;
+ $actions = array($limit => 44, 44 => 64);
+ $j = 0;
+
+ for (;;) {
+ // Mixing round.
+ $encrypt_block .= '
+ $r0 = (($r0 + ' . $keys[$j++] . ' +
+ ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF) << 1;
+ $r0 |= $r0 >> 16;
+ $r1 = (($r1 + ' . $keys[$j++] . ' +
+ ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF) << 2;
+ $r1 |= $r1 >> 16;
+ $r2 = (($r2 + ' . $keys[$j++] . ' +
+ ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF) << 3;
+ $r2 |= $r2 >> 16;
+ $r3 = (($r3 + ' . $keys[$j++] . ' +
+ ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF) << 5;
+ $r3 |= $r3 >> 16;';
+
+ if ($j === $limit) {
+ if ($limit === 64) {
+ break;
+ }
+
+ // Mashing round.
+ $encrypt_block .= '
+ $r0 += $keys[$r3 & 0x3F];
+ $r1 += $keys[$r0 & 0x3F];
+ $r2 += $keys[$r1 & 0x3F];
+ $r3 += $keys[$r2 & 0x3F];';
+ $limit = $actions[$limit];
+ }
+ }
+
+ $encrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
+
+ // Create code for decryption.
+ $limit = 44;
+ $actions = array($limit => 20, 20 => 0);
+ $j = 64;
+
+ for (;;) {
+ // R-mixing round.
+ $decrypt_block .= '
+ $r3 = ($r3 | ($r3 << 16)) >> 5;
+ $r3 = ($r3 - ' . $keys[--$j] . ' -
+ ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF;
+ $r2 = ($r2 | ($r2 << 16)) >> 3;
+ $r2 = ($r2 - ' . $keys[--$j] . ' -
+ ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF;
+ $r1 = ($r1 | ($r1 << 16)) >> 2;
+ $r1 = ($r1 - ' . $keys[--$j] . ' -
+ ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF;
+ $r0 = ($r0 | ($r0 << 16)) >> 1;
+ $r0 = ($r0 - ' . $keys[--$j] . ' -
+ ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF;';
+
+ if ($j === $limit) {
+ if ($limit === 0) {
+ break;
+ }
+
+ // R-mashing round.
+ $decrypt_block .= '
+ $r3 = ($r3 - $keys[$r2 & 0x3F]) & 0xFFFF;
+ $r2 = ($r2 - $keys[$r1 & 0x3F]) & 0xFFFF;
+ $r1 = ($r1 - $keys[$r0 & 0x3F]) & 0xFFFF;
+ $r0 = ($r0 - $keys[$r3 & 0x3F]) & 0xFFFF;';
+ $limit = $actions[$limit];
+ }
+ }
+
+ $decrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
+
+ // Creates the inline-crypt function
+ $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+ array(
+ 'init_crypt' => $init_crypt,
+ 'encrypt_block' => $encrypt_block,
+ 'decrypt_block' => $decrypt_block
+ )
+ );
+ }
+
+ // Set the inline-crypt function as callback in: $this->inline_crypt
+ $this->inline_crypt = $lambda_functions[$code_hash];
+ }
+}
diff --git a/vendor/phpseclib/Crypt/RC4.php b/vendor/phpseclib/Crypt/RC4.php
index eaf5c58828..9849654b28 100644
--- a/vendor/phpseclib/Crypt/RC4.php
+++ b/vendor/phpseclib/Crypt/RC4.php
@@ -16,12 +16,12 @@
* - {@link http://en.wikipedia.org/wiki/RC4 - Wikipedia: RC4}
*
* RC4 is also known as ARCFOUR or ARC4. The reason is elaborated upon at Wikipedia. This class is named RC4 and not
- * ARCFOUR or ARC4 because RC4 is how it is refered to in the SSH1 specification.
+ * ARCFOUR or ARC4 because RC4 is how it is referred to in the SSH1 specification.
*
* Here's a short example of how to use this library:
*
*
- * @copyright MMVII Jim Wigginton
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @version $Id: RC4.php,v 1.8 2009/06/09 04:00:38 terrafrost Exp $
- * @link http://phpseclib.sourceforge.net
+ * @category Crypt
+ * @package Crypt_RC4
+ * @author Jim Wigginton
+ * @copyright MMVII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
*/
+/**
+ * Make sure we have the base loaded
+ */
+class_exists('PHPSecLib\Crypt_Base');
+
/**#@+
* @access private
- * @see Crypt_RC4::Crypt_RC4()
+ * @see Crypt_RC4::__construct()
*/
/**
* Toggles the internal implementation
*/
-define('CRYPT_RC4_MODE_INTERNAL', 1);
+define('CRYPT_RC4_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
/**
* Toggles the mcrypt implementation
*/
-define('CRYPT_RC4_MODE_MCRYPT', 2);
+define('CRYPT_RC4_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
/**#@-*/
/**#@+
@@ -89,158 +93,91 @@
/**
* Pure-PHP implementation of RC4.
*
+ * @package Crypt_RC4
* @author Jim Wigginton
- * @version 0.1.0
* @access public
- * @package Crypt_RC4
*/
-class Crypt_RC4 {
- /**
- * The Key
- *
- * @see Crypt_RC4::setKey()
- * @var String
- * @access private
- */
- var $key = "\0";
-
+class Crypt_RC4 extends Crypt_Base
+{
/**
- * The Key Stream for encryption
+ * Block Length of the cipher
*
- * If CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT, this will be equal to the mcrypt object
+ * RC4 is a stream cipher
+ * so we the block_size to 0
*
- * @see Crypt_RC4::setKey()
- * @var Array
+ * @see Crypt_Base::block_size
+ * @var Integer
* @access private
*/
- var $encryptStream = false;
+ var $block_size = 0;
/**
- * The Key Stream for decryption
- *
- * If CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT, this will be equal to the mcrypt object
+ * The default password key_size used by setPassword()
*
- * @see Crypt_RC4::setKey()
- * @var Array
+ * @see Crypt_Base::password_key_size
+ * @see Crypt_Base::setPassword()
+ * @var Integer
* @access private
*/
- var $decryptStream = false;
+ var $password_key_size = 128; // = 1024 bits
/**
- * The $i and $j indexes for encryption
+ * The namespace used by the cipher for its constants.
*
- * @see Crypt_RC4::_crypt()
- * @var Integer
+ * @see Crypt_Base::const_namespace
+ * @var String
* @access private
*/
- var $encryptIndex = 0;
+ var $const_namespace = 'RC4';
/**
- * The $i and $j indexes for decryption
+ * The mcrypt specific name of the cipher
*
- * @see Crypt_RC4::_crypt()
- * @var Integer
+ * @see Crypt_Base::cipher_name_mcrypt
+ * @var String
* @access private
*/
- var $decryptIndex = 0;
+ var $cipher_name_mcrypt = 'arcfour';
/**
- * MCrypt parameters
+ * Holds whether performance-optimized $inline_crypt() can/should be used.
*
- * @see Crypt_RC4::setMCrypt()
- * @var Array
+ * @see Crypt_Base::inline_crypt
+ * @var mixed
* @access private
*/
- var $mcrypt = array('', '');
+ var $use_inline_crypt = false; // currently not available
/**
- * The Encryption Algorithm
- *
- * Only used if CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT. Only possible values are MCRYPT_RC4 or MCRYPT_ARCFOUR.
+ * The Key
*
- * @see Crypt_RC4::Crypt_RC4()
- * @var Integer
+ * @see Crypt_RC4::setKey()
+ * @var String
* @access private
*/
- var $mode;
+ var $key = "\0";
/**
- * Continuous Buffer status
+ * The Key Stream for decryption and encryption
*
- * @see Crypt_RC4::enableContinuousBuffer()
- * @var Boolean
+ * @see Crypt_RC4::setKey()
+ * @var Array
* @access private
*/
- var $continuousBuffer = false;
+ var $stream;
/**
* Default Constructor.
*
* Determines whether or not the mcrypt extension should be used.
*
- * @param optional Integer $mode
+ * @see Crypt_Base::__construct()
* @return Crypt_RC4
* @access public
*/
function __construct()
{
- if ( !defined('CRYPT_RC4_MODE') ) {
- switch (true) {
- case extension_loaded('mcrypt') && (defined('MCRYPT_ARCFOUR') || defined('MCRYPT_RC4')):
- // i'd check to see if rc4 was supported, by doing in_array('arcfour', mcrypt_list_algorithms('')),
- // but since that can be changed after the object has been created, there doesn't seem to be
- // a lot of point...
- define('CRYPT_RC4_MODE', CRYPT_RC4_MODE_MCRYPT);
- break;
- default:
- define('CRYPT_RC4_MODE', CRYPT_RC4_MODE_INTERNAL);
- }
- }
-
- switch ( CRYPT_RC4_MODE ) {
- case CRYPT_RC4_MODE_MCRYPT:
- switch (true) {
- case defined('MCRYPT_ARCFOUR'):
- $this->mode = MCRYPT_ARCFOUR;
- break;
- case defined('MCRYPT_RC4');
- $this->mode = MCRYPT_RC4;
- }
- }
- }
-
- /**
- * Sets the key.
- *
- * Keys can be between 1 and 256 bytes long. If they are longer then 256 bytes, the first 256 bytes will
- * be used. If no key is explicitly set, it'll be assumed to be a single null byte.
- *
- * @access public
- * @param String $key
- */
- function setKey($key)
- {
- $this->key = $key;
-
- if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
- return;
- }
-
- $keyLength = strlen($key);
- $keyStream = array();
- for ($i = 0; $i < 256; $i++) {
- $keyStream[$i] = $i;
- }
- $j = 0;
- for ($i = 0; $i < 256; $i++) {
- $j = ($j + $keyStream[$i] + ord($key[$i % $keyLength])) & 255;
- $temp = $keyStream[$i];
- $keyStream[$i] = $keyStream[$j];
- $keyStream[$j] = $temp;
- }
-
- $this->encryptIndex = $this->decryptIndex = array(0, 0);
- $this->encryptStream = $this->decryptStream = $keyStream;
+ parent::__construct(CRYPT_MODE_STREAM);
}
/**
@@ -267,32 +204,34 @@ function setIV($iv)
}
/**
- * Sets MCrypt parameters. (optional)
+ * Sets the key.
*
- * If MCrypt is being used, empty strings will be used, unless otherwise specified.
+ * Keys can be between 1 and 256 bytes long. If they are longer then 256 bytes, the first 256 bytes will
+ * be used. If no key is explicitly set, it'll be assumed to be a single null byte.
*
- * @link http://php.net/function.mcrypt-module-open#function.mcrypt-module-open
* @access public
- * @param optional Integer $algorithm_directory
- * @param optional Integer $mode_directory
+ * @see Crypt_Base::setKey()
+ * @param String $key
*/
- function setMCrypt($algorithm_directory = '', $mode_directory = '')
+ function setKey($key)
{
- if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
- $this->mcrypt = array($algorithm_directory, $mode_directory);
- $this->_closeMCrypt();
- }
+ parent::setKey(substr($key, 0, 256));
}
/**
* Encrypts a message.
*
+ * @see Crypt_Base::decrypt()
* @see Crypt_RC4::_crypt()
* @access public
* @param String $plaintext
+ * @return String $ciphertext
*/
function encrypt($plaintext)
{
+ if ($this->engine == CRYPT_MODE_MCRYPT) {
+ return parent::encrypt($plaintext);
+ }
return $this->_crypt($plaintext, CRYPT_RC4_ENCRYPT);
}
@@ -300,208 +239,90 @@ function encrypt($plaintext)
* Decrypts a message.
*
* $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
- * Atleast if the continuous buffer is disabled.
+ * At least if the continuous buffer is disabled.
*
+ * @see Crypt_Base::encrypt()
* @see Crypt_RC4::_crypt()
* @access public
* @param String $ciphertext
+ * @return String $plaintext
*/
function decrypt($ciphertext)
{
+ if ($this->engine == CRYPT_MODE_MCRYPT) {
+ return parent::decrypt($ciphertext);
+ }
return $this->_crypt($ciphertext, CRYPT_RC4_DECRYPT);
}
+
/**
- * Encrypts or decrypts a message.
+ * Setup the key (expansion)
*
- * @see Crypt_RC4::encrypt()
- * @see Crypt_RC4::decrypt()
+ * @see Crypt_Base::_setupKey()
* @access private
- * @param String $text
- * @param Integer $mode
*/
- function _crypt($text, $mode)
+ function _setupKey()
{
- if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
- $keyStream = $mode == CRYPT_RC4_ENCRYPT ? 'encryptStream' : 'decryptStream';
-
- if ($this->$keyStream === false) {
- $this->$keyStream = mcrypt_module_open($this->mode, $this->mcrypt[0], MCRYPT_MODE_STREAM, $this->mcrypt[1]);
- mcrypt_generic_init($this->$keyStream, $this->key, '');
- } else if (!$this->continuousBuffer) {
- mcrypt_generic_init($this->$keyStream, $this->key, '');
- }
- $newText = mcrypt_generic($this->$keyStream, $text);
- if (!$this->continuousBuffer) {
- mcrypt_generic_deinit($this->$keyStream);
- }
-
- return $newText;
- }
-
- if ($this->encryptStream === false) {
- $this->setKey($this->key);
- }
-
- switch ($mode) {
- case CRYPT_RC4_ENCRYPT:
- $keyStream = $this->encryptStream;
- list($i, $j) = $this->encryptIndex;
- break;
- case CRYPT_RC4_DECRYPT:
- $keyStream = $this->decryptStream;
- list($i, $j) = $this->decryptIndex;
- }
-
- $newText = '';
- for ($k = 0; $k < strlen($text); $k++) {
- $i = ($i + 1) & 255;
- $j = ($j + $keyStream[$i]) & 255;
+ $key = $this->key;
+ $keyLength = strlen($key);
+ $keyStream = range(0, 255);
+ $j = 0;
+ for ($i = 0; $i < 256; $i++) {
+ $j = ($j + $keyStream[$i] + ord($key[$i % $keyLength])) & 255;
$temp = $keyStream[$i];
$keyStream[$i] = $keyStream[$j];
$keyStream[$j] = $temp;
- $temp = $keyStream[($keyStream[$i] + $keyStream[$j]) & 255];
- $newText.= chr(ord($text[$k]) ^ $temp);
}
- if ($this->continuousBuffer) {
- switch ($mode) {
- case CRYPT_RC4_ENCRYPT:
- $this->encryptStream = $keyStream;
- $this->encryptIndex = array($i, $j);
- break;
- case CRYPT_RC4_DECRYPT:
- $this->decryptStream = $keyStream;
- $this->decryptIndex = array($i, $j);
- }
- }
-
- return $newText;
+ $this->stream = array();
+ $this->stream[CRYPT_RC4_DECRYPT] = $this->stream[CRYPT_RC4_ENCRYPT] = array(
+ 0, // index $i
+ 0, // index $j
+ $keyStream
+ );
}
/**
- * Treat consecutive "packets" as if they are a continuous buffer.
- *
- * Say you have a 16-byte plaintext $plaintext. Using the default behavior, the two following code snippets
- * will yield different outputs:
- *
- *
- * echo $rc4->encrypt(substr($plaintext, 0, 8));
- * echo $rc4->encrypt(substr($plaintext, 8, 8));
- *
- *
- * echo $rc4->encrypt($plaintext);
- *
- *
- * The solution is to enable the continuous buffer. Although this will resolve the above discrepancy, it creates
- * another, as demonstrated with the following:
- *
- *
- * $rc4->encrypt(substr($plaintext, 0, 8));
- * echo $rc4->decrypt($des->encrypt(substr($plaintext, 8, 8)));
- *
- *
- * echo $rc4->decrypt($des->encrypt(substr($plaintext, 8, 8)));
- *
- *
- * With the continuous buffer disabled, these would yield the same output. With it enabled, they yield different
- * outputs. The reason is due to the fact that the initialization vector's change after every encryption /
- * decryption round when the continuous buffer is enabled. When it's disabled, they remain constant.
- *
- * Put another way, when the continuous buffer is enabled, the state of the Crypt_DES() object changes after each
- * encryption / decryption round, whereas otherwise, it'd remain constant. For this reason, it's recommended that
- * continuous buffers not be used. They do offer better security and are, in fact, sometimes required (SSH uses them),
- * however, they are also less intuitive and more likely to cause you problems.
- *
- * @see Crypt_RC4::disableContinuousBuffer()
- * @access public
- */
- function enableContinuousBuffer()
- {
- $this->continuousBuffer = true;
- }
-
- /**
- * Treat consecutive packets as if they are a discontinuous buffer.
- *
- * The default behavior.
+ * Encrypts or decrypts a message.
*
- * @see Crypt_RC4::enableContinuousBuffer()
- * @access public
+ * @see Crypt_RC4::encrypt()
+ * @see Crypt_RC4::decrypt()
+ * @access private
+ * @param String $text
+ * @param Integer $mode
+ * @return String $text
*/
- function disableContinuousBuffer()
+ function _crypt($text, $mode)
{
- if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_INTERNAL ) {
- $this->encryptIndex = $this->decryptIndex = array(0, 0);
- $this->setKey($this->key);
+ if ($this->changed) {
+ $this->_setup();
+ $this->changed = false;
}
- $this->continuousBuffer = false;
- }
-
- /**
- * Dummy function.
- *
- * Since RC4 is a stream cipher and not a block cipher, no padding is necessary. The only reason this function is
- * included is so that you can switch between a block cipher and a stream cipher transparently.
- *
- * @see Crypt_RC4::disablePadding()
- * @access public
- */
- function enablePadding()
- {
- }
-
- /**
- * Dummy function.
- *
- * @see Crypt_RC4::enablePadding()
- * @access public
- */
- function disablePadding()
- {
- }
-
- /**
- * Class destructor.
- *
- * Will be called, automatically, if you're using PHP5. If you're using PHP4, call it yourself. Only really
- * needs to be called if mcrypt is being used.
- *
- * @access public
- */
- function __destruct()
- {
- if ( CRYPT_RC4_MODE == CRYPT_RC4_MODE_MCRYPT ) {
- $this->_closeMCrypt();
+ $stream = &$this->stream[$mode];
+ if ($this->continuousBuffer) {
+ $i = &$stream[0];
+ $j = &$stream[1];
+ $keyStream = &$stream[2];
+ } else {
+ $i = $stream[0];
+ $j = $stream[1];
+ $keyStream = $stream[2];
}
- }
- /**
- * Properly close the MCrypt objects.
- *
- * @access prviate
- */
- function _closeMCrypt()
- {
- if ( $this->encryptStream !== false ) {
- if ( $this->continuousBuffer ) {
- mcrypt_generic_deinit($this->encryptStream);
- }
-
- mcrypt_module_close($this->encryptStream);
+ $len = strlen($text);
+ for ($k = 0; $k < $len; ++$k) {
+ $i = ($i + 1) & 255;
+ $ksi = $keyStream[$i];
+ $j = ($j + $ksi) & 255;
+ $ksj = $keyStream[$j];
- $this->encryptStream = false;
+ $keyStream[$i] = $ksj;
+ $keyStream[$j] = $ksi;
+ $text[$k] = $text[$k] ^ chr($keyStream[($ksj + $ksi) & 255]);
}
- if ( $this->decryptStream !== false ) {
- if ( $this->continuousBuffer ) {
- mcrypt_generic_deinit($this->decryptStream);
- }
-
- mcrypt_module_close($this->decryptStream);
-
- $this->decryptStream = false;
- }
+ return $text;
}
}
diff --git a/vendor/phpseclib/Crypt/RSA.php b/vendor/phpseclib/Crypt/RSA.php
index be7cb56cd0..5650739a58 100644
--- a/vendor/phpseclib/Crypt/RSA.php
+++ b/vendor/phpseclib/Crypt/RSA.php
@@ -11,7 +11,7 @@
* Here's an example of how to encrypt and decrypt text with this library:
*
* createKey());
@@ -29,7 +29,7 @@
* Here's an example of how to create signatures and verify signatures with this library:
*
* createKey());
@@ -62,21 +62,26 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
- * @category Crypt
- * @package Crypt_RSA
- * @author Jim Wigginton
- * @copyright MMIX Jim Wigginton
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @version $Id: RSA.php,v 1.19 2010/09/12 21:58:54 terrafrost Exp $
- * @link http://phpseclib.sourceforge.net
+ * @category Crypt
+ * @package Crypt_RSA
+ * @author Jim Wigginton
+ * @copyright MMIX Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
*/
-/**#@+
- * Crypt random global function
- *
- * @see Crypt/Random.php
+use \PHPSecLib\Math\BigInteger;
+
+/**
+ * Include Crypt_Random
*/
-require_once (__DIR__.DS.'../Crypt/Random.php');
+// the class_exists() will only be called if the crypt_random_string function hasn't been defined and
+// will trigger a call to __autoload() if you're wanting to auto-load classes
+// call function_exists() a second time to stop the include_once from being called outside
+// of the auto loader
+if (!function_exists('crypt_random_string')) {
+ include 'Random.php';
+}
/**#@+
* @access public
@@ -97,7 +102,7 @@
* Use PKCS#1 padding.
*
* Although CRYPT_RSA_ENCRYPTION_OAEP offers more security, including PKCS#1 padding is necessary for purposes of backwards
- * compatability with protocols (like SSH-1) written before OAEP's introduction.
+ * compatibility with protocols (like SSH-1) written before OAEP's introduction.
*/
define('CRYPT_RSA_ENCRYPTION_PKCS1', 2);
/**#@-*/
@@ -121,7 +126,7 @@
* Use the PKCS#1 scheme by default.
*
* Although CRYPT_RSA_SIGNATURE_PSS offers more security, including PKCS#1 signing is necessary for purposes of backwards
- * compatability with protocols (like SSH-2) written before PSS's introduction.
+ * compatibility with protocols (like SSH-2) written before PSS's introduction.
*/
define('CRYPT_RSA_SIGNATURE_PKCS1', 2);
/**#@-*/
@@ -133,16 +138,28 @@
/**
* ASN1 Integer
*/
-define('CRYPT_RSA_ASN1_INTEGER', 2);
+define('CRYPT_RSA_ASN1_INTEGER', 2);
+/**
+ * ASN1 Bit String
+ */
+define('CRYPT_RSA_ASN1_BITSTRING', 3);
+/**
+ * ASN1 Octet String
+ */
+define('CRYPT_RSA_ASN1_OCTETSTRING', 4);
+/**
+ * ASN1 Object Identifier
+ */
+define('CRYPT_RSA_ASN1_OBJECT', 6);
/**
* ASN1 Sequence (with the constucted bit set)
*/
-define('CRYPT_RSA_ASN1_SEQUENCE', 48);
+define('CRYPT_RSA_ASN1_SEQUENCE', 48);
/**#@-*/
/**#@+
* @access private
- * @see Crypt_RSA::Crypt_RSA()
+ * @see Crypt_RSA::__construct()
*/
/**
* To use the pure-PHP implementation
@@ -156,6 +173,11 @@
define('CRYPT_RSA_MODE_OPENSSL', 2);
/**#@-*/
+/**
+ * Default openSSL configuration file.
+ */
+define('CRYPT_RSA_OPENSSL_CONFIG', dirname(__FILE__) . '/../openssl.cnf');
+
/**#@+
* @access public
* @see Crypt_RSA::createKey()
@@ -175,6 +197,10 @@
* XML formatted private key
*/
define('CRYPT_RSA_PRIVATE_FORMAT_XML', 2);
+/**
+ * PKCS#8 formatted private key
+ */
+define('CRYPT_RSA_PRIVATE_FORMAT_PKCS8', 3);
/**#@-*/
/**#@+
@@ -185,7 +211,7 @@
/**
* Raw public key
*
- * An array containing two Math_BigInteger objects.
+ * An array containing two \phpseclib\Math\BigInteger objects.
*
* The exponent can be indexed with any of the following:
*
@@ -197,9 +223,18 @@
*/
define('CRYPT_RSA_PUBLIC_FORMAT_RAW', 3);
/**
- * PKCS#1 formatted public key
+ * PKCS#1 formatted public key (raw)
+ *
+ * Used by File/X509.php
+ *
+ * Has the following header:
+ *
+ * -----BEGIN RSA PUBLIC KEY-----
+ *
+ * Analogous to ssh-keygen's pem format (as specified by -m)
*/
define('CRYPT_RSA_PUBLIC_FORMAT_PKCS1', 4);
+define('CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW', 4);
/**
* XML formatted public key
*/
@@ -210,17 +245,31 @@
* Place in $HOME/.ssh/authorized_keys
*/
define('CRYPT_RSA_PUBLIC_FORMAT_OPENSSH', 6);
+/**
+ * PKCS#1 formatted public key (encapsulated)
+ *
+ * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
+ *
+ * Has the following header:
+ *
+ * -----BEGIN PUBLIC KEY-----
+ *
+ * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
+ * is specific to private keys it's basically creating a DER-encoded wrapper
+ * for keys. This just extends that same concept to public keys (much like ssh-keygen)
+ */
+define('CRYPT_RSA_PUBLIC_FORMAT_PKCS8', 7);
/**#@-*/
/**
* Pure-PHP PKCS#1 compliant implementation of RSA.
*
+ * @package Crypt_RSA
* @author Jim Wigginton
- * @version 0.1.0
* @access public
- * @package Crypt_RSA
*/
-class Crypt_RSA {
+class Crypt_RSA
+{
/**
* Precomputed Zero
*
@@ -251,12 +300,12 @@ class Crypt_RSA {
* @var Integer
* @access public
*/
- var $publicKeyFormat = CRYPT_RSA_PUBLIC_FORMAT_PKCS1;
+ var $publicKeyFormat = CRYPT_RSA_PUBLIC_FORMAT_PKCS8;
/**
* Modulus (ie. n)
*
- * @var Math_BigInteger
+ * @var \phpseclib\Math\BigInteger
* @access private
*/
var $modulus;
@@ -264,7 +313,7 @@ class Crypt_RSA {
/**
* Modulus length
*
- * @var Math_BigInteger
+ * @var \phpseclib\Math\BigInteger
* @access private
*/
var $k;
@@ -272,7 +321,7 @@ class Crypt_RSA {
/**
* Exponent (ie. e or d)
*
- * @var Math_BigInteger
+ * @var \phpseclib\Math\BigInteger
* @access private
*/
var $exponent;
@@ -379,7 +428,7 @@ class Crypt_RSA {
* @var String
* @access private
*/
- var $password = '';
+ var $password = false;
/**
* Components
@@ -405,6 +454,24 @@ class Crypt_RSA {
*/
var $current;
+ /**
+ * OpenSSL configuration file name.
+ *
+ * Set to null to use system configuration file.
+ * @see Crypt_RSA::createKey()
+ * @var Mixed
+ * @Access public
+ */
+ var $configFile;
+
+ /**
+ * Public key comment field.
+ *
+ * @var String
+ * @access private
+ */
+ var $comment = 'phpseclib-generated-key';
+
/**
* The constructor
*
@@ -417,18 +484,56 @@ class Crypt_RSA {
*/
function __construct()
{
+ $this->configFile = CRYPT_RSA_OPENSSL_CONFIG;
+
if ( !defined('CRYPT_RSA_MODE') ) {
- switch (true) {
- //case extension_loaded('openssl') && version_compare(PHP_VERSION, '4.2.0', '>='):
- // define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_OPENSSL);
- // break;
- default:
+ // Math/BigInteger's openssl requirements are a little less stringent than Crypt/RSA's. in particular,
+ // Math/BigInteger doesn't require an openssl.cfg file whereas Crypt/RSA does. so if Math/BigInteger
+ // can't use OpenSSL it can be pretty trivially assumed, then, that Crypt/RSA can't either.
+ if ( defined('MATH_BIGINTEGER_OPENSSL_DISABLE') ) {
+ define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_INTERNAL);
+ }
+
+ switch ( !defined('CRYPT_RSA_MODE') ) { // ie. only run this if the above didn't set CRYPT_RSA_MODE already
+ // openssl_pkey_get_details - which is used in the only place Crypt/RSA.php uses OpenSSL - was introduced in PHP 5.2.0
+ case !function_exists('openssl_pkey_get_details'):
+ define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_INTERNAL);
+ break;
+ case extension_loaded('openssl') && version_compare(PHP_VERSION, '4.2.0', '>=') && file_exists($this->configFile):
+ // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
+ ob_start();
+ @phpinfo();
+ $content = ob_get_contents();
+ ob_end_clean();
+
+ preg_match_all('#OpenSSL (Header|Library) Version(.*)#im', $content, $matches);
+
+ $versions = array();
+ if (!empty($matches[1])) {
+ for ($i = 0; $i < count($matches[1]); $i++) {
+ $versions[$matches[1][$i]] = trim(str_replace('=>', '', strip_tags($matches[2][$i])));
+ }
+ }
+
+ // it doesn't appear that OpenSSL versions were reported upon until PHP 5.3+
+ switch (true) {
+ case !isset($versions['Header']):
+ case !isset($versions['Library']):
+ case $versions['Header'] == $versions['Library']:
+ define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_OPENSSL);
+ break;
+ default:
+ define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_INTERNAL);
+ define('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
+ }
+ break;
+ case true:
define('CRYPT_RSA_MODE', CRYPT_RSA_MODE_INTERNAL);
}
}
- $this->zero = new Math_BigInteger();
- $this->one = new Math_BigInteger(1);
+ $this->zero = new BigInteger();
+ $this->one = new BigInteger(1);
$this->hash = new Crypt_Hash('sha1');
$this->hLen = $this->hash->getLength();
@@ -449,20 +554,40 @@ function __construct()
* @access public
* @param optional Integer $bits
* @param optional Integer $timeout
- * @param optional Math_BigInteger $p
+ * @param optional array $p
*/
function createKey($bits = 1024, $timeout = false, $partial = array())
{
- if ( CRYPT_RSA_MODE == CRYPT_RSA_MODE_OPENSSL ) {
- $rsa = openssl_pkey_new(array('private_key_bits' => $bits));
- openssl_pkey_export($rsa, $privatekey);
+ if (!defined('CRYPT_RSA_EXPONENT')) {
+ // http://en.wikipedia.org/wiki/65537_%28number%29
+ define('CRYPT_RSA_EXPONENT', '65537');
+ }
+ // per , this number ought not result in primes smaller
+ // than 256 bits. as a consequence if the key you're trying to create is 1024 bits and you've set CRYPT_RSA_SMALLEST_PRIME
+ // to 384 bits then you're going to get a 384 bit prime and a 640 bit prime (384 + 1024 % 384). at least if
+ // CRYPT_RSA_MODE is set to CRYPT_RSA_MODE_INTERNAL. if CRYPT_RSA_MODE is set to CRYPT_RSA_MODE_OPENSSL then
+ // CRYPT_RSA_SMALLEST_PRIME is ignored (ie. multi-prime RSA support is more intended as a way to speed up RSA key
+ // generation when there's a chance neither gmp nor OpenSSL are installed)
+ if (!defined('CRYPT_RSA_SMALLEST_PRIME')) {
+ define('CRYPT_RSA_SMALLEST_PRIME', 4096);
+ }
+
+ // OpenSSL uses 65537 as the exponent and requires RSA keys be 384 bits minimum
+ if ( CRYPT_RSA_MODE == CRYPT_RSA_MODE_OPENSSL && $bits >= 384 && CRYPT_RSA_EXPONENT == 65537) {
+ $config = array();
+ if (isset($this->configFile)) {
+ $config['config'] = $this->configFile;
+ }
+ $rsa = openssl_pkey_new(array('private_key_bits' => $bits) + $config);
+ openssl_pkey_export($rsa, $privatekey, null, $config);
$publickey = openssl_pkey_get_details($rsa);
$publickey = $publickey['key'];
- if ($this->privateKeyFormat != CRYPT_RSA_PRIVATE_FORMAT_PKCS1) {
- $privatekey = call_user_func_array(array($this, '_convertPrivateKey'), array_values($this->_parseKey($privatekey, CRYPT_RSA_PRIVATE_FORMAT_PKCS1)));
- $publickey = call_user_func_array(array($this, '_convertPublicKey'), array_values($this->_parseKey($publickey, CRYPT_RSA_PUBLIC_FORMAT_PKCS1)));
- }
+ $privatekey = call_user_func_array(array($this, '_convertPrivateKey'), array_values($this->_parseKey($privatekey, CRYPT_RSA_PRIVATE_FORMAT_PKCS1)));
+ $publickey = call_user_func_array(array($this, '_convertPublicKey'), array_values($this->_parseKey($publickey, CRYPT_RSA_PUBLIC_FORMAT_PKCS1)));
+
+ // clear the buffer of error strings stemming from a minimalistic openssl.cnf
+ while (openssl_error_string() !== false);
return array(
'privatekey' => $privatekey,
@@ -473,25 +598,12 @@ function createKey($bits = 1024, $timeout = false, $partial = array())
static $e;
if (!isset($e)) {
- if (!defined('CRYPT_RSA_EXPONENT')) {
- // http://en.wikipedia.org/wiki/65537_%28number%29
- define('CRYPT_RSA_EXPONENT', '65537');
- }
- if (!defined('CRYPT_RSA_COMMENT')) {
- define('CRYPT_RSA_COMMENT', 'phpseclib-generated-key');
- }
- // per , this number ought not result in primes smaller
- // than 256 bits.
- if (!defined('CRYPT_RSA_SMALLEST_PRIME')) {
- define('CRYPT_RSA_SMALLEST_PRIME', 4096);
- }
-
- $e = new Math_BigInteger(CRYPT_RSA_EXPONENT);
+ $e = new BigInteger(CRYPT_RSA_EXPONENT);
}
extract($this->_generateMinMax($bits));
$absoluteMin = $min;
- $temp = $bits >> 1;
+ $temp = $bits >> 1; // divide by two to see how many bits P and Q would be
if ($temp > CRYPT_RSA_SMALLEST_PRIME) {
$num_primes = floor($bits / CRYPT_RSA_SMALLEST_PRIME);
$temp = CRYPT_RSA_SMALLEST_PRIME;
@@ -502,8 +614,7 @@ function createKey($bits = 1024, $timeout = false, $partial = array())
$finalMax = $max;
extract($this->_generateMinMax($temp));
- $generator = new Math_BigInteger();
- $generator->setRandomGenerator('crypt_random');
+ $generator = new BigInteger();
$n = $this->one->copy();
if (!empty($partial)) {
@@ -586,12 +697,12 @@ function createKey($bits = 1024, $timeout = false, $partial = array())
$exponents[$i] = $e->modInverse($temp);
}
- list($lcm) = $lcm['top']->divide($lcm['bottom']);
- $gcd = $lcm->gcd($e);
+ list($temp) = $lcm['top']->divide($lcm['bottom']);
+ $gcd = $temp->gcd($e);
$i0 = 1;
} while (!$gcd->equals($this->one));
- $d = $e->modInverse($lcm);
+ $d = $e->modInverse($temp);
$coefficients[2] = $primes[2]->modInverse($primes[1]);
@@ -642,6 +753,72 @@ function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
// if the format in question does not support multi-prime rsa and multi-prime rsa was used,
// call _convertPublicKey() instead.
switch ($this->privateKeyFormat) {
+ case CRYPT_RSA_PRIVATE_FORMAT_XML:
+ if ($num_primes != 2) {
+ return false;
+ }
+ return "\r\n" .
+ ' ' . base64_encode($raw['modulus']) . " \r\n" .
+ ' ' . base64_encode($raw['publicExponent']) . " \r\n" .
+ ' ' . base64_encode($raw['prime1']) . "
\r\n" .
+ ' ' . base64_encode($raw['prime2']) . "
\r\n" .
+ ' ' . base64_encode($raw['exponent1']) . " \r\n" .
+ ' ' . base64_encode($raw['exponent2']) . " \r\n" .
+ ' ' . base64_encode($raw['coefficient']) . " \r\n" .
+ ' ' . base64_encode($raw['privateExponent']) . " \r\n" .
+ ' ';
+ break;
+ case CRYPT_RSA_PRIVATE_FORMAT_PUTTY:
+ if ($num_primes != 2) {
+ return false;
+ }
+ $key = "PuTTY-User-Key-File-2: ssh-rsa\r\nEncryption: ";
+ $encryption = (!empty($this->password) || is_string($this->password)) ? 'aes256-cbc' : 'none';
+ $key.= $encryption;
+ $key.= "\r\nComment: " . $this->comment . "\r\n";
+ $public = pack('Na*Na*Na*',
+ strlen('ssh-rsa'), 'ssh-rsa', strlen($raw['publicExponent']), $raw['publicExponent'], strlen($raw['modulus']), $raw['modulus']
+ );
+ $source = pack('Na*Na*Na*Na*',
+ strlen('ssh-rsa'), 'ssh-rsa', strlen($encryption), $encryption,
+ strlen($this->comment), $this->comment, strlen($public), $public
+ );
+ $public = base64_encode($public);
+ $key.= "Public-Lines: " . ((strlen($public) + 63) >> 6) . "\r\n";
+ $key.= chunk_split($public, 64);
+ $private = pack('Na*Na*Na*Na*',
+ strlen($raw['privateExponent']), $raw['privateExponent'], strlen($raw['prime1']), $raw['prime1'],
+ strlen($raw['prime2']), $raw['prime2'], strlen($raw['coefficient']), $raw['coefficient']
+ );
+ if (empty($this->password) && !is_string($this->password)) {
+ $source.= pack('Na*', strlen($private), $private);
+ $hashkey = 'putty-private-key-file-mac-key';
+ } else {
+ $private.= crypt_random_string(16 - (strlen($private) & 15));
+ $source.= pack('Na*', strlen($private), $private);
+ $sequence = 0;
+ $symkey = '';
+ while (strlen($symkey) < 32) {
+ $temp = pack('Na*', $sequence++, $this->password);
+ $symkey.= pack('H*', sha1($temp));
+ }
+ $symkey = substr($symkey, 0, 32);
+ $crypto = new Crypt_AES();
+
+ $crypto->setKey($symkey);
+ $crypto->disablePadding();
+ $private = $crypto->encrypt($private);
+ $hashkey = 'putty-private-key-file-mac-key' . $this->password;
+ }
+
+ $private = base64_encode($private);
+ $key.= 'Private-Lines: ' . ((strlen($private) + 63) >> 6) . "\r\n";
+ $key.= chunk_split($private, 64);
+ $hash = new Crypt_Hash('sha1');
+ $hash->setKey(pack('H*', sha1($hashkey)));
+ $key.= 'Private-MAC: ' . bin2hex($hash->hash($source)) . "\r\n";
+
+ return $key;
default: // eg. CRYPT_RSA_PRIVATE_FORMAT_PKCS1
$components = array();
foreach ($raw as $name => $value) {
@@ -670,8 +847,51 @@ function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
$RSAPrivateKey = pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
- if (!empty($this->password)) {
- $iv = $this->_random(8);
+ if ($this->privateKeyFormat == CRYPT_RSA_PRIVATE_FORMAT_PKCS8) {
+ $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+ $RSAPrivateKey = pack('Ca*a*Ca*a*',
+ CRYPT_RSA_ASN1_INTEGER, "\01\00", $rsaOID, 4, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey
+ );
+ $RSAPrivateKey = pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
+ if (!empty($this->password) || is_string($this->password)) {
+ $salt = crypt_random_string(8);
+ $iterationCount = 2048;
+
+ $crypto = new Crypt_DES();
+ $crypto->setPassword($this->password, 'pbkdf1', 'md5', $salt, $iterationCount);
+ $RSAPrivateKey = $crypto->encrypt($RSAPrivateKey);
+
+ $parameters = pack('Ca*a*Ca*N',
+ CRYPT_RSA_ASN1_OCTETSTRING, $this->_encodeLength(strlen($salt)), $salt,
+ CRYPT_RSA_ASN1_INTEGER, $this->_encodeLength(4), $iterationCount
+ );
+ $pbeWithMD5AndDES_CBC = "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03";
+
+ $encryptionAlgorithm = pack('Ca*a*Ca*a*',
+ CRYPT_RSA_ASN1_OBJECT, $this->_encodeLength(strlen($pbeWithMD5AndDES_CBC)), $pbeWithMD5AndDES_CBC,
+ CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($parameters)), $parameters
+ );
+
+ $RSAPrivateKey = pack('Ca*a*Ca*a*',
+ CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($encryptionAlgorithm)), $encryptionAlgorithm,
+ CRYPT_RSA_ASN1_OCTETSTRING, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey
+ );
+
+ $RSAPrivateKey = pack('Ca*a*', CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
+
+ $RSAPrivateKey = "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" .
+ chunk_split(base64_encode($RSAPrivateKey), 64) .
+ '-----END ENCRYPTED PRIVATE KEY-----';
+ } else {
+ $RSAPrivateKey = "-----BEGIN PRIVATE KEY-----\r\n" .
+ chunk_split(base64_encode($RSAPrivateKey), 64) .
+ '-----END PRIVATE KEY-----';
+ }
+ return $RSAPrivateKey;
+ }
+
+ if (!empty($this->password) || is_string($this->password)) {
+ $iv = crypt_random_string(8);
$symkey = pack('H*', md5($this->password . $iv)); // symkey is short for symmetric key
$symkey.= substr(pack('H*', md5($symkey . $this->password . $iv)), 0, 8);
$des = new Crypt_TripleDES();
@@ -682,11 +902,11 @@ function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
"Proc-Type: 4,ENCRYPTED\r\n" .
"DEK-Info: DES-EDE3-CBC,$iv\r\n" .
"\r\n" .
- chunk_split(base64_encode($des->encrypt($RSAPrivateKey))) .
+ chunk_split(base64_encode($des->encrypt($RSAPrivateKey)), 64) .
'-----END RSA PRIVATE KEY-----';
} else {
$RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
- chunk_split(base64_encode($RSAPrivateKey)) .
+ chunk_split(base64_encode($RSAPrivateKey), 64) .
'-----END RSA PRIVATE KEY-----';
}
@@ -710,16 +930,22 @@ function _convertPublicKey($n, $e)
switch ($this->publicKeyFormat) {
case CRYPT_RSA_PUBLIC_FORMAT_RAW:
return array('e' => $e->copy(), 'n' => $n->copy());
+ case CRYPT_RSA_PUBLIC_FORMAT_XML:
+ return "\r\n" .
+ ' ' . base64_encode($modulus) . " \r\n" .
+ ' ' . base64_encode($publicExponent) . " \r\n" .
+ ' ';
+ break;
case CRYPT_RSA_PUBLIC_FORMAT_OPENSSH:
// from :
// string "ssh-rsa"
// mpint e
// mpint n
$RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
- $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . CRYPT_RSA_COMMENT;
+ $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . $this->comment;
return $RSAPublicKey;
- default: // eg. CRYPT_RSA_PUBLIC_FORMAT_PKCS1
+ default: // eg. CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW or CRYPT_RSA_PUBLIC_FORMAT_PKCS1
// from :
// RSAPublicKey ::= SEQUENCE {
// modulus INTEGER, -- n
@@ -735,9 +961,24 @@ function _convertPublicKey($n, $e)
$components['modulus'], $components['publicExponent']
);
- $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
- chunk_split(base64_encode($RSAPublicKey)) .
- '-----END PUBLIC KEY-----';
+ if ($this->publicKeyFormat == CRYPT_RSA_PUBLIC_FORMAT_PKCS1_RAW) {
+ $RSAPublicKey = "-----BEGIN RSA PUBLIC KEY-----\r\n" .
+ chunk_split(base64_encode($RSAPublicKey), 64) .
+ '-----END RSA PUBLIC KEY-----';
+ } else {
+ // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
+ $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+ $RSAPublicKey = chr(0) . $RSAPublicKey;
+ $RSAPublicKey = chr(3) . $this->_encodeLength(strlen($RSAPublicKey)) . $RSAPublicKey;
+
+ $RSAPublicKey = pack('Ca*a*',
+ CRYPT_RSA_ASN1_SEQUENCE, $this->_encodeLength(strlen($rsaOID . $RSAPublicKey)), $rsaOID . $RSAPublicKey
+ );
+
+ $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
+ chunk_split(base64_encode($RSAPublicKey), 64) .
+ '-----END PUBLIC KEY-----';
+ }
return $RSAPublicKey;
}
@@ -755,6 +996,10 @@ function _convertPublicKey($n, $e)
*/
function _parseKey($key, $type)
{
+ if ($type != CRYPT_RSA_PUBLIC_FORMAT_RAW && !is_string($key)) {
+ return false;
+ }
+
switch ($type) {
case CRYPT_RSA_PUBLIC_FORMAT_RAW:
if (!is_array($key)) {
@@ -787,8 +1032,9 @@ function _parseKey($key, $type)
case isset($key[1]):
$components['modulus'] = $key[1]->copy();
}
- return $components;
+ return isset($components['modulus']) && isset($components['publicExponent']) ? $components : false;
case CRYPT_RSA_PRIVATE_FORMAT_PKCS1:
+ case CRYPT_RSA_PRIVATE_FORMAT_PKCS8:
case CRYPT_RSA_PUBLIC_FORMAT_PKCS1:
/* Although PKCS#1 proposes a format that public and private keys can use, encrypting them is
"outside the scope" of PKCS#1. PKCS#1 then refers you to PKCS#12 and PKCS#15 if you're wanting to
@@ -808,13 +1054,17 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
if (preg_match('#DEK-Info: (.+),(.+)#', $key, $matches)) {
$iv = pack('H*', trim($matches[2]));
$symkey = pack('H*', md5($this->password . substr($iv, 0, 8))); // symkey is short for symmetric key
- $symkey.= substr(pack('H*', md5($symkey . $this->password . $iv)), 0, 8);
- $ciphertext = preg_replace('#.+(\r|\n|\r\n)\1|[\r\n]|-.+-#s', '', $key);
- $ciphertext = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $ciphertext) ? base64_decode($ciphertext) : false;
+ $symkey.= pack('H*', md5($symkey . $this->password . substr($iv, 0, 8)));
+ // remove the Proc-Type / DEK-Info sections as they're no longer needed
+ $key = preg_replace('#^(?:Proc-Type|DEK-Info): .*#m', '', $key);
+ $ciphertext = $this->_extractBER($key);
if ($ciphertext === false) {
$ciphertext = $key;
}
switch ($matches[1]) {
+ case 'AES-256-CBC':
+ $crypto = new Crypt_AES();
+ break;
case 'AES-128-CBC':
$symkey = substr($symkey, 0, 16);
$crypto = new Crypt_AES();
@@ -823,6 +1073,7 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
$crypto = new Crypt_TripleDES(CRYPT_DES_MODE_CFB);
break;
case 'DES-EDE3-CBC':
+ $symkey = substr($symkey, 0, 24);
$crypto = new Crypt_TripleDES();
break;
case 'DES-CBC':
@@ -835,8 +1086,7 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
$crypto->setIV($iv);
$decoded = $crypto->decrypt($ciphertext);
} else {
- $decoded = preg_replace('#-.+-|[\r\n]#', '', $key);
- $decoded = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $decoded) ? base64_decode($decoded) : false;
+ $decoded = $this->_extractBER($key);
}
if ($decoded !== false) {
@@ -853,7 +1103,66 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
}
$tag = ord($this->_string_shift($key));
+ /* intended for keys for which OpenSSL's asn1parse returns the following:
+
+ 0:d=0 hl=4 l= 631 cons: SEQUENCE
+ 4:d=1 hl=2 l= 1 prim: INTEGER :00
+ 7:d=1 hl=2 l= 13 cons: SEQUENCE
+ 9:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption
+ 20:d=2 hl=2 l= 0 prim: NULL
+ 22:d=1 hl=4 l= 609 prim: OCTET STRING
+
+ ie. PKCS8 keys*/
+
+ if ($tag == CRYPT_RSA_ASN1_INTEGER && substr($key, 0, 3) == "\x01\x00\x30") {
+ $this->_string_shift($key, 3);
+ $tag = CRYPT_RSA_ASN1_SEQUENCE;
+ }
+
if ($tag == CRYPT_RSA_ASN1_SEQUENCE) {
+ $temp = $this->_string_shift($key, $this->_decodeLength($key));
+ if (ord($this->_string_shift($temp)) != CRYPT_RSA_ASN1_OBJECT) {
+ return false;
+ }
+ $length = $this->_decodeLength($temp);
+ switch ($this->_string_shift($temp, $length)) {
+ case "\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01": // rsaEncryption
+ break;
+ case "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03": // pbeWithMD5AndDES-CBC
+ /*
+ PBEParameter ::= SEQUENCE {
+ salt OCTET STRING (SIZE(8)),
+ iterationCount INTEGER }
+ */
+ if (ord($this->_string_shift($temp)) != CRYPT_RSA_ASN1_SEQUENCE) {
+ return false;
+ }
+ if ($this->_decodeLength($temp) != strlen($temp)) {
+ return false;
+ }
+ $this->_string_shift($temp); // assume it's an octet string
+ $salt = $this->_string_shift($temp, $this->_decodeLength($temp));
+ if (ord($this->_string_shift($temp)) != CRYPT_RSA_ASN1_INTEGER) {
+ return false;
+ }
+ $this->_decodeLength($temp);
+ list(, $iterationCount) = unpack('N', str_pad($temp, 4, chr(0), STR_PAD_LEFT));
+ $this->_string_shift($key); // assume it's an octet string
+ $length = $this->_decodeLength($key);
+ if (strlen($key) != $length) {
+ return false;
+ }
+
+ $crypto = new Crypt_DES();
+ $crypto->setPassword($this->password, 'pbkdf1', 'md5', $salt, $iterationCount);
+ $key = $crypto->decrypt($key);
+ if ($key === false) {
+ return false;
+ }
+ return $this->_parseKey($key, CRYPT_RSA_PRIVATE_FORMAT_PKCS1);
+ default:
+ return false;
+ }
/* intended for keys for which OpenSSL's asn1parse returns the following:
0:d=0 hl=4 l= 290 cons: SEQUENCE
@@ -861,13 +1170,14 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
6:d=2 hl=2 l= 9 prim: OBJECT :rsaEncryption
17:d=2 hl=2 l= 0 prim: NULL
19:d=1 hl=4 l= 271 prim: BIT STRING */
- $this->_string_shift($key, $this->_decodeLength($key));
- $this->_string_shift($key); // skip over the BIT STRING tag
- $this->_decodeLength($key); // skip over the BIT STRING length
+ $tag = ord($this->_string_shift($key)); // skip over the BIT STRING / OCTET STRING tag
+ $this->_decodeLength($key); // skip over the BIT STRING / OCTET STRING length
// "The initial octet shall encode, as an unsigned binary integer wtih bit 1 as the least significant bit, the number of
- // unused bits in teh final subsequent octet. The number shall be in the range zero to seven."
+ // unused bits in the final subsequent octet. The number shall be in the range zero to seven."
// -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf (section 8.6.2.2)
- $this->_string_shift($key);
+ if ($tag == CRYPT_RSA_ASN1_BITSTRING) {
+ $this->_string_shift($key);
+ }
if (ord($this->_string_shift($key)) != CRYPT_RSA_ASN1_SEQUENCE) {
return false;
}
@@ -883,10 +1193,10 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
$length = $this->_decodeLength($key);
$temp = $this->_string_shift($key, $length);
if (strlen($temp) != 1 || ord($temp) > 2) {
- $components['modulus'] = new Math_BigInteger($temp, -256);
+ $components['modulus'] = new BigInteger($temp, 256);
$this->_string_shift($key); // skip over CRYPT_RSA_ASN1_INTEGER
$length = $this->_decodeLength($key);
- $components[$type == CRYPT_RSA_PUBLIC_FORMAT_PKCS1 ? 'publicExponent' : 'privateExponent'] = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $components[$type == CRYPT_RSA_PUBLIC_FORMAT_PKCS1 ? 'publicExponent' : 'privateExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
return $components;
}
@@ -894,28 +1204,28 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
return false;
}
$length = $this->_decodeLength($key);
- $components['modulus'] = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $components['modulus'] = new BigInteger($this->_string_shift($key, $length), 256);
$this->_string_shift($key);
$length = $this->_decodeLength($key);
- $components['publicExponent'] = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $components['publicExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
$this->_string_shift($key);
$length = $this->_decodeLength($key);
- $components['privateExponent'] = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $components['privateExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
$this->_string_shift($key);
$length = $this->_decodeLength($key);
- $components['primes'] = array(1 => new Math_BigInteger($this->_string_shift($key, $length), -256));
+ $components['primes'] = array(1 => new BigInteger($this->_string_shift($key, $length), 256));
$this->_string_shift($key);
$length = $this->_decodeLength($key);
- $components['primes'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $components['primes'][] = new BigInteger($this->_string_shift($key, $length), 256);
$this->_string_shift($key);
$length = $this->_decodeLength($key);
- $components['exponents'] = array(1 => new Math_BigInteger($this->_string_shift($key, $length), -256));
+ $components['exponents'] = array(1 => new BigInteger($this->_string_shift($key, $length), 256));
$this->_string_shift($key);
$length = $this->_decodeLength($key);
- $components['exponents'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $components['exponents'][] = new BigInteger($this->_string_shift($key, $length), 256);
$this->_string_shift($key);
$length = $this->_decodeLength($key);
- $components['coefficients'] = array(2 => new Math_BigInteger($this->_string_shift($key, $length), -256));
+ $components['coefficients'] = array(2 => new BigInteger($this->_string_shift($key, $length), 256));
if (!empty($key)) {
if (ord($this->_string_shift($key)) != CRYPT_RSA_ASN1_SEQUENCE) {
@@ -929,40 +1239,56 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
$this->_decodeLength($key);
$key = substr($key, 1);
$length = $this->_decodeLength($key);
- $components['primes'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $components['primes'][] = new BigInteger($this->_string_shift($key, $length), 256);
$this->_string_shift($key);
$length = $this->_decodeLength($key);
- $components['exponents'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $components['exponents'][] = new BigInteger($this->_string_shift($key, $length), 256);
$this->_string_shift($key);
$length = $this->_decodeLength($key);
- $components['coefficients'][] = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $components['coefficients'][] = new BigInteger($this->_string_shift($key, $length), 256);
}
}
return $components;
case CRYPT_RSA_PUBLIC_FORMAT_OPENSSH:
- $key = base64_decode(preg_replace('#^ssh-rsa | .+$#', '', $key));
+ $parts = explode(' ', $key, 3);
+
+ $key = isset($parts[1]) ? base64_decode($parts[1]) : false;
if ($key === false) {
return false;
}
+ $comment = isset($parts[2]) ? $parts[2] : false;
+
$cleanup = substr($key, 0, 11) == "\0\0\0\7ssh-rsa";
+ if (strlen($key) <= 4) {
+ return false;
+ }
extract(unpack('Nlength', $this->_string_shift($key, 4)));
- $publicExponent = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $publicExponent = new BigInteger($this->_string_shift($key, $length), -256);
+ if (strlen($key) <= 4) {
+ return false;
+ }
extract(unpack('Nlength', $this->_string_shift($key, 4)));
- $modulus = new Math_BigInteger($this->_string_shift($key, $length), -256);
+ $modulus = new BigInteger($this->_string_shift($key, $length), -256);
if ($cleanup && strlen($key)) {
+ if (strlen($key) <= 4) {
+ return false;
+ }
extract(unpack('Nlength', $this->_string_shift($key, 4)));
- return array(
- 'modulus' => new Math_BigInteger($this->_string_shift($key, $length), -256),
- 'publicExponent' => $modulus
+ $realModulus = new BigInteger($this->_string_shift($key, $length), -256);
+ return strlen($key) ? false : array(
+ 'modulus' => $realModulus,
+ 'publicExponent' => $modulus,
+ 'comment' => $comment
);
} else {
- return array(
+ return strlen($key) ? false : array(
'modulus' => $modulus,
- 'publicExponent' => $publicExponent
+ 'publicExponent' => $publicExponent,
+ 'comment' => $comment
);
}
// http://www.w3.org/TR/xmldsig-core/#sec-RSAKeyValue
@@ -975,11 +1301,12 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
xml_set_object($xml, $this);
xml_set_element_handler($xml, '_start_element_handler', '_stop_element_handler');
xml_set_character_data_handler($xml, '_data_handler');
- if (!xml_parse($xml, $key)) {
+ // add to account for "dangling" tags like ... that are sometimes added
+ if (!xml_parse($xml, '' . $key . ' ')) {
return false;
}
- return $this->components;
+ return isset($this->components['modulus']) && isset($this->components['publicExponent']) ? $this->components : false;
// from PuTTY's SSHPUBK.C
case CRYPT_RSA_PRIVATE_FORMAT_PUTTY:
$components = array();
@@ -989,14 +1316,15 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
return false;
}
$encryption = trim(preg_replace('#Encryption: (.+)#', '$1', $key[1]));
+ $comment = trim(preg_replace('#Comment: (.+)#', '$1', $key[2]));
$publicLength = trim(preg_replace('#Public-Lines: (\d+)#', '$1', $key[3]));
$public = base64_decode(implode('', array_map('trim', array_slice($key, 4, $publicLength))));
$public = substr($public, 11);
extract(unpack('Nlength', $this->_string_shift($public, 4)));
- $components['publicExponent'] = new Math_BigInteger($this->_string_shift($public, $length), -256);
+ $components['publicExponent'] = new BigInteger($this->_string_shift($public, $length), -256);
extract(unpack('Nlength', $this->_string_shift($public, 4)));
- $components['modulus'] = new Math_BigInteger($this->_string_shift($public, $length), -256);
+ $components['modulus'] = new BigInteger($this->_string_shift($public, $length), -256);
$privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$publicLength + 4]));
$private = base64_decode(implode('', array_map('trim', array_slice($key, $publicLength + 5, $privateLength))));
@@ -1023,11 +1351,20 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
}
extract(unpack('Nlength', $this->_string_shift($private, 4)));
- $components['privateExponent'] = new Math_BigInteger($this->_string_shift($private, $length), -256);
+ if (strlen($private) < $length) {
+ return false;
+ }
+ $components['privateExponent'] = new BigInteger($this->_string_shift($private, $length), -256);
extract(unpack('Nlength', $this->_string_shift($private, 4)));
- $components['primes'] = array(1 => new Math_BigInteger($this->_string_shift($private, $length), -256));
+ if (strlen($private) < $length) {
+ return false;
+ }
+ $components['primes'] = array(1 => new BigInteger($this->_string_shift($private, $length), -256));
extract(unpack('Nlength', $this->_string_shift($private, 4)));
- $components['primes'][] = new Math_BigInteger($this->_string_shift($private, $length), -256);
+ if (strlen($private) < $length) {
+ return false;
+ }
+ $components['primes'][] = new BigInteger($this->_string_shift($private, $length), -256);
$temp = $components['primes'][1]->subtract($this->one);
$components['exponents'] = array(1 => $components['publicExponent']->modInverse($temp));
@@ -1035,12 +1372,28 @@ function. As is, the definitive authority on this encoding scheme isn't the IET
$components['exponents'][] = $components['publicExponent']->modInverse($temp);
extract(unpack('Nlength', $this->_string_shift($private, 4)));
- $components['coefficients'] = array(2 => new Math_BigInteger($this->_string_shift($private, $length), -256));
+ if (strlen($private) < $length) {
+ return false;
+ }
+ $components['coefficients'] = array(2 => new BigInteger($this->_string_shift($private, $length), -256));
return $components;
}
}
+ /**
+ * Returns the key size
+ *
+ * More specifically, this returns the size of the modulo in bits.
+ *
+ * @access public
+ * @return Integer
+ */
+ function getSize()
+ {
+ return !isset($this->modulus) ? 0 : strlen($this->modulus->toBits());
+ }
+
/**
* Start Element Handler
*
@@ -1078,9 +1431,6 @@ function _start_element_handler($parser, $name, $attribs)
break;
case 'D':
$this->current = &$this->components['privateExponent'];
- break;
- default:
- unset($this->current);
}
$this->current = '';
}
@@ -1096,11 +1446,10 @@ function _start_element_handler($parser, $name, $attribs)
*/
function _stop_element_handler($parser, $name)
{
- //$name = strtoupper($name);
- if ($name == 'RSAKEYVALUE') {
- return;
+ if (isset($this->current)) {
+ $this->current = new BigInteger(base64_decode($this->current), 256);
+ unset($this->current);
}
- $this->current = new Math_BigInteger(base64_decode($this->current), 256);
}
/**
@@ -1131,6 +1480,53 @@ function _data_handler($parser, $data)
*/
function loadKey($key, $type = false)
{
+ if (is_object($key) && strtolower(get_class($key)) == 'crypt_rsa') {
+ $this->privateKeyFormat = $key->privateKeyFormat;
+ $this->publicKeyFormat = $key->publicKeyFormat;
+ $this->k = $key->k;
+ $this->hLen = $key->hLen;
+ $this->sLen = $key->sLen;
+ $this->mgfHLen = $key->mgfHLen;
+ $this->encryptionMode = $key->encryptionMode;
+ $this->signatureMode = $key->signatureMode;
+ $this->password = $key->password;
+ $this->configFile = $key->configFile;
+ $this->comment = $key->comment;
+
+ if (is_object($key->hash)) {
+ $this->hash = new Crypt_Hash($key->hash->getHash());
+ }
+ if (is_object($key->mgfHash)) {
+ $this->mgfHash = new Crypt_Hash($key->mgfHash->getHash());
+ }
+
+ if (is_object($key->modulus)) {
+ $this->modulus = $key->modulus->copy();
+ }
+ if (is_object($key->exponent)) {
+ $this->exponent = $key->exponent->copy();
+ }
+ if (is_object($key->publicExponent)) {
+ $this->publicExponent = $key->publicExponent->copy();
+ }
+
+ $this->primes = array();
+ $this->exponents = array();
+ $this->coefficients = array();
+
+ foreach ($this->primes as $prime) {
+ $this->primes[] = $prime->copy();
+ }
+ foreach ($this->exponents as $exponent) {
+ $this->exponents[] = $exponent->copy();
+ }
+ foreach ($this->coefficients as $coefficient) {
+ $this->coefficients[] = $coefficient->copy();
+ }
+
+ return true;
+ }
+
if ($type === false) {
$types = array(
CRYPT_RSA_PUBLIC_FORMAT_RAW,
@@ -1154,6 +1550,9 @@ function loadKey($key, $type = false)
return false;
}
+ if (isset($components['comment']) && $components['comment'] !== false) {
+ $this->comment = $components['comment'];
+ }
$this->modulus = $components['modulus'];
$this->k = strlen($this->modulus->toBytes());
$this->exponent = isset($components['privateExponent']) ? $components['privateExponent'] : $components['publicExponent'];
@@ -1169,6 +1568,19 @@ function loadKey($key, $type = false)
$this->publicExponent = false;
}
+ switch ($type) {
+ case CRYPT_RSA_PUBLIC_FORMAT_OPENSSH:
+ case CRYPT_RSA_PUBLIC_FORMAT_RAW:
+ $this->setPublicKey();
+ break;
+ case CRYPT_RSA_PRIVATE_FORMAT_PKCS1:
+ switch (true) {
+ case strpos($key, '-BEGIN PUBLIC KEY-') !== false:
+ case strpos($key, '-BEGIN RSA PUBLIC KEY-') !== false:
+ $this->setPublicKey();
+ }
+ }
+
return true;
}
@@ -1176,14 +1588,14 @@ function loadKey($key, $type = false)
* Sets the password
*
* Private keys can be encrypted with a password. To unset the password, pass in the empty string or false.
- * Or rather, pass in $password such that empty($password) is true.
+ * Or rather, pass in $password such that empty($password) && !is_string($password) is true.
*
* @see createKey()
* @see loadKey()
* @access public
* @param String $password
*/
- function setPassword($password)
+ function setPassword($password = false)
{
$this->password = $password;
}
@@ -1195,7 +1607,9 @@ function setPassword($password)
* used in certain contexts. For example, in SSH-2, RSA authentication works by sending the public key along with a
* message signed by the private key to the server. The SSH-2 server looks the public key up in an index of public keys
* and if it's present then proceeds to verify the signature. Problem is, if your private key doesn't include the public
- * exponent this won't work unless you manually add the public exponent.
+ * exponent this won't work unless you manually add the public exponent. phpseclib tries to guess if the key being used
+ * is the public key but in the event that it guesses incorrectly you might still want to explicitly set the key as being
+ * public.
*
* Do note that when a new key is loaded the index will be cleared.
*
@@ -1203,24 +1617,88 @@ function setPassword($password)
*
* @see getPublicKey()
* @access public
- * @param String $key
+ * @param String $key optional
* @param Integer $type optional
* @return Boolean
*/
- function setPublicKey($key, $type = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
+ function setPublicKey($key = false, $type = false)
{
- $components = $this->_parseKey($key, $type);
+ // if a public key has already been loaded return false
+ if (!empty($this->publicExponent)) {
+ return false;
+ }
- if (empty($this->modulus) || !$this->modulus->equals($components['modulus'])) {
- user_error('Trying to load a public key? Use loadKey() instead. It\'s called loadKey() and not loadPrivateKey() for a reason.', E_USER_NOTICE);
+ if ($key === false && !empty($this->modulus)) {
+ $this->publicExponent = $this->exponent;
+ return true;
+ }
+
+ if ($type === false) {
+ $types = array(
+ CRYPT_RSA_PUBLIC_FORMAT_RAW,
+ CRYPT_RSA_PUBLIC_FORMAT_PKCS1,
+ CRYPT_RSA_PUBLIC_FORMAT_XML,
+ CRYPT_RSA_PUBLIC_FORMAT_OPENSSH
+ );
+ foreach ($types as $type) {
+ $components = $this->_parseKey($key, $type);
+ if ($components !== false) {
+ break;
+ }
+ }
+ } else {
+ $components = $this->_parseKey($key, $type);
+ }
+
+ if ($components === false) {
return false;
}
+ if (empty($this->modulus) || !$this->modulus->equals($components['modulus'])) {
+ $this->modulus = $components['modulus'];
+ $this->exponent = $this->publicExponent = $components['publicExponent'];
+ return true;
+ }
+
$this->publicExponent = $components['publicExponent'];
return true;
}
+ /**
+ * Defines the private key
+ *
+ * If phpseclib guessed a private key was a public key and loaded it as such it might be desirable to force
+ * phpseclib to treat the key as a private key. This function will do that.
+ *
+ * Do note that when a new key is loaded the index will be cleared.
+ *
+ * Returns true on success, false on failure
+ *
+ * @see getPublicKey()
+ * @access public
+ * @param String $key optional
+ * @param Integer $type optional
+ * @return Boolean
+ */
+ function setPrivateKey($key = false, $type = false)
+ {
+ if ($key === false && !empty($this->publicExponent)) {
+ unset($this->publicExponent);
+ return true;
+ }
+
+ $rsa = new Crypt_RSA();
+ if (!$rsa->loadKey($key, $type)) {
+ return false;
+ }
+ unset($rsa->publicExponent);
+
+ // don't overwrite the old key if the new key is invalid
+ $this->loadKey($rsa);
+ return true;
+ }
+
/**
* Returns the public key
*
@@ -1233,7 +1711,7 @@ function setPublicKey($key, $type = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
* @param String $key
* @param Integer $type optional
*/
- function getPublicKey($type = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
+ function getPublicKey($type = CRYPT_RSA_PUBLIC_FORMAT_PKCS8)
{
if (empty($this->modulus) || empty($this->publicExponent)) {
return false;
@@ -1246,6 +1724,80 @@ function getPublicKey($type = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
return $temp;
}
+ /**
+ * Returns the private key
+ *
+ * The private key is only returned if the currently loaded key contains the constituent prime numbers.
+ *
+ * @see getPublicKey()
+ * @access public
+ * @param String $key
+ * @param Integer $type optional
+ */
+ function getPrivateKey($type = CRYPT_RSA_PUBLIC_FORMAT_PKCS1)
+ {
+ if (empty($this->primes)) {
+ return false;
+ }
+
+ $oldFormat = $this->privateKeyFormat;
+ $this->privateKeyFormat = $type;
+ $temp = $this->_convertPrivateKey($this->modulus, $this->publicExponent, $this->exponent, $this->primes, $this->exponents, $this->coefficients);
+ $this->privateKeyFormat = $oldFormat;
+ return $temp;
+ }
+
+ /**
+ * Returns a minimalistic private key
+ *
+ * Returns the private key without the prime number constituants. Structurally identical to a public key that
+ * hasn't been set as the public key
+ *
+ * @see getPrivateKey()
+ * @access private
+ * @param String $key
+ * @param Integer $type optional
+ */
+ function _getPrivatePublicKey($mode = CRYPT_RSA_PUBLIC_FORMAT_PKCS8)
+ {
+ if (empty($this->modulus) || empty($this->exponent)) {
+ return false;
+ }
+
+ $oldFormat = $this->publicKeyFormat;
+ $this->publicKeyFormat = $mode;
+ $temp = $this->_convertPublicKey($this->modulus, $this->exponent);
+ $this->publicKeyFormat = $oldFormat;
+ return $temp;
+ }
+
+ /**
+ * __toString() magic method
+ *
+ * @access public
+ */
+ function __toString()
+ {
+ $key = $this->getPrivateKey($this->privateKeyFormat);
+ if ($key !== false) {
+ return $key;
+ }
+ $key = $this->_getPrivatePublicKey($this->publicKeyFormat);
+ return $key !== false ? $key : '';
+ }
+
+ /**
+ * __clone() magic method
+ *
+ * @access public
+ */
+ function __clone()
+ {
+ $key = new Crypt_RSA();
+ $key->loadKey($this);
+ return $key;
+ }
+
/**
* Generates the smallest and largest numbers requiring $bits bits
*
@@ -1267,8 +1819,8 @@ function _generateMinMax($bits)
}
return array(
- 'min' => new Math_BigInteger($min, 256),
- 'max' => new Math_BigInteger($max, 256)
+ 'min' => new BigInteger($min, 256),
+ 'max' => new BigInteger($max, 256)
);
}
@@ -1276,7 +1828,7 @@ function _generateMinMax($bits)
* DER-decode the length
*
* DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4. See
- * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 § 8.1.3} for more information.
+ * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
*
* @access private
* @param String $string
@@ -1297,7 +1849,7 @@ function _decodeLength(&$string)
* DER-encode the length
*
* DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4. See
- * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 § 8.1.3} for more information.
+ * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
*
* @access private
* @param Integer $length
@@ -1426,38 +1978,13 @@ function setSaltLength($sLen)
$this->sLen = $sLen;
}
- /**
- * Generates a random string x bytes long
- *
- * @access public
- * @param Integer $bytes
- * @param optional Integer $nonzero
- * @return String
- */
- function _random($bytes, $nonzero = false)
- {
- $temp = '';
- if ($nonzero) {
- for ($i = 0; $i < $bytes; $i++) {
- $temp.= chr(crypt_random(1, 255));
- }
- } else {
- $ints = ($bytes + 1) >> 2;
- for ($i = 0; $i < $ints; $i++) {
- $temp.= pack('N', crypt_random());
- }
- $temp = substr($temp, 0, $bytes);
- }
- return $temp;
- }
-
/**
* Integer-to-Octet-String primitive
*
* See {@link http://tools.ietf.org/html/rfc3447#section-4.1 RFC3447#section-4.1}.
*
* @access private
- * @param Math_BigInteger $x
+ * @param \phpseclib\Math\BigInteger $x
* @param Integer $xLen
* @return String
*/
@@ -1465,7 +1992,7 @@ function _i2osp($x, $xLen)
{
$x = $x->toBytes();
if (strlen($x) > $xLen) {
- user_error('Integer too large', E_USER_NOTICE);
+ user_error('Integer too large');
return false;
}
return str_pad($x, $xLen, chr(0), STR_PAD_LEFT);
@@ -1478,11 +2005,11 @@ function _i2osp($x, $xLen)
*
* @access private
* @param String $x
- * @return Math_BigInteger
+ * @return \phpseclib\Math\BigInteger
*/
function _os2ip($x)
{
- return new Math_BigInteger($x, 256);
+ return new BigInteger($x, 256);
}
/**
@@ -1491,8 +2018,8 @@ function _os2ip($x)
* See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.2}.
*
* @access private
- * @param Math_BigInteger $x
- * @return Math_BigInteger
+ * @param \phpseclib\Math\BigInteger $x
+ * @return \phpseclib\Math\BigInteger
*/
function _exponentiate($x)
{
@@ -1532,8 +2059,7 @@ function _exponentiate($x)
}
}
- $one = new Math_BigInteger(1);
- $one->setRandomGenerator('crypt_random');
+ $one = new BigInteger(1);
$r = $one->random($one, $smallest->subtract($one));
@@ -1570,10 +2096,10 @@ function _exponentiate($x)
* Returns $x->modPow($this->exponents[$i], $this->primes[$i])
*
* @access private
- * @param Math_BigInteger $x
- * @param Math_BigInteger $r
+ * @param \phpseclib\Math\BigInteger $x
+ * @param \phpseclib\Math\BigInteger $r
* @param Integer $i
- * @return Math_BigInteger
+ * @return \phpseclib\Math\BigInteger
*/
function _blind($x, $r, $i)
{
@@ -1587,19 +2113,47 @@ function _blind($x, $r, $i)
return $x;
}
+ /**
+ * Performs blinded RSA equality testing
+ *
+ * Protects against a particular type of timing attack described.
+ *
+ * See {@link http://codahale.com/a-lesson-in-timing-attacks/ A Lesson In Timing Attacks (or, Don't use MessageDigest.isEquals)}
+ *
+ * Thanks for the heads up singpolyma!
+ *
+ * @access private
+ * @param String $x
+ * @param String $y
+ * @return Boolean
+ */
+ function _equals($x, $y)
+ {
+ if (strlen($x) != strlen($y)) {
+ return false;
+ }
+
+ $result = 0;
+ for ($i = 0; $i < strlen($x); $i++) {
+ $result |= ord($x[$i]) ^ ord($y[$i]);
+ }
+
+ return $result == 0;
+ }
+
/**
* RSAEP
*
* See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
*
* @access private
- * @param Math_BigInteger $m
- * @return Math_BigInteger
+ * @param \phpseclib\Math\BigInteger $m
+ * @return \phpseclib\Math\BigInteger
*/
function _rsaep($m)
{
if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
- user_error('Message representative out of range', E_USER_NOTICE);
+ user_error('Message representative out of range');
return false;
}
return $this->_exponentiate($m);
@@ -1611,13 +2165,13 @@ function _rsaep($m)
* See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
*
* @access private
- * @param Math_BigInteger $c
- * @return Math_BigInteger
+ * @param \phpseclib\Math\BigInteger $c
+ * @return \phpseclib\Math\BigInteger
*/
function _rsadp($c)
{
if ($c->compare($this->zero) < 0 || $c->compare($this->modulus) > 0) {
- user_error('Ciphertext representative out of range', E_USER_NOTICE);
+ user_error('Ciphertext representative out of range');
return false;
}
return $this->_exponentiate($c);
@@ -1629,13 +2183,13 @@ function _rsadp($c)
* See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
*
* @access private
- * @param Math_BigInteger $m
- * @return Math_BigInteger
+ * @param \phpseclib\Math\BigInteger $m
+ * @return \phpseclib\Math\BigInteger
*/
function _rsasp1($m)
{
if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
- user_error('Message representative out of range', E_USER_NOTICE);
+ user_error('Message representative out of range');
return false;
}
return $this->_exponentiate($m);
@@ -1647,13 +2201,13 @@ function _rsasp1($m)
* See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
*
* @access private
- * @param Math_BigInteger $s
- * @return Math_BigInteger
+ * @param \phpseclib\Math\BigInteger $s
+ * @return \phpseclib\Math\BigInteger
*/
function _rsavp1($s)
{
if ($s->compare($this->zero) < 0 || $s->compare($this->modulus) > 0) {
- user_error('Signature representative out of range', E_USER_NOTICE);
+ user_error('Signature representative out of range');
return false;
}
return $this->_exponentiate($s);
@@ -1704,7 +2258,7 @@ function _rsaes_oaep_encrypt($m, $l = '')
// be output.
if ($mLen > $this->k - 2 * $this->hLen - 2) {
- user_error('Message too long', E_USER_NOTICE);
+ user_error('Message too long');
return false;
}
@@ -1713,7 +2267,7 @@ function _rsaes_oaep_encrypt($m, $l = '')
$lHash = $this->hash->hash($l);
$ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
$db = $lHash . $ps . chr(1) . $m;
- $seed = $this->_random($this->hLen);
+ $seed = crypt_random_string($this->hLen);
$dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
$maskedDB = $db ^ $dbMask;
$seedMask = $this->_mgf1($maskedDB, $this->hLen);
@@ -1765,7 +2319,7 @@ function _rsaes_oaep_decrypt($c, $l = '')
// be output.
if (strlen($c) != $this->k || $this->k < 2 * $this->hLen + 2) {
- user_error('Decryption error', E_USER_NOTICE);
+ user_error('Decryption error');
return false;
}
@@ -1774,7 +2328,7 @@ function _rsaes_oaep_decrypt($c, $l = '')
$c = $this->_os2ip($c);
$m = $this->_rsadp($c);
if ($m === false) {
- user_error('Decryption error', E_USER_NOTICE);
+ user_error('Decryption error');
return false;
}
$em = $this->_i2osp($m, $this->k);
@@ -1792,12 +2346,12 @@ function _rsaes_oaep_decrypt($c, $l = '')
$lHash2 = substr($db, 0, $this->hLen);
$m = substr($db, $this->hLen);
if ($lHash != $lHash2) {
- user_error('Decryption error', E_USER_NOTICE);
+ user_error('Decryption error');
return false;
}
$m = ltrim($m, chr(0));
if (ord($m[0]) != 1) {
- user_error('Decryption error', E_USER_NOTICE);
+ user_error('Decryption error');
return false;
}
@@ -1822,14 +2376,27 @@ function _rsaes_pkcs1_v1_5_encrypt($m)
// Length checking
if ($mLen > $this->k - 11) {
- user_error('Message too long', E_USER_NOTICE);
+ user_error('Message too long');
return false;
}
// EME-PKCS1-v1_5 encoding
- $ps = $this->_random($this->k - $mLen - 3, true);
- $em = chr(0) . chr(2) . $ps . chr(0) . $m;
+ $psLen = $this->k - $mLen - 3;
+ $ps = '';
+ while (strlen($ps) != $psLen) {
+ $temp = crypt_random_string($psLen - strlen($ps));
+ $temp = str_replace("\x00", '', $temp);
+ $ps.= $temp;
+ }
+ $type = 2;
+ // see the comments of _rsaes_pkcs1_v1_5_decrypt() to understand why this is being done
+ if (defined('CRYPT_RSA_PKCS15_COMPAT') && (!isset($this->publicExponent) || $this->exponent !== $this->publicExponent)) {
+ $type = 1;
+ // "The padding string PS shall consist of k-3-||D|| octets. ... for block type 01, they shall have value FF"
+ $ps = str_repeat("\xFF", $psLen);
+ }
+ $em = chr(0) . chr($type) . $ps . chr(0) . $m;
// RSA encryption
$m = $this->_os2ip($em);
@@ -1846,11 +2413,11 @@ function _rsaes_pkcs1_v1_5_encrypt($m)
*
* See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
*
- * For compatability purposes, this function departs slightly from the description given in RFC3447.
+ * For compatibility purposes, this function departs slightly from the description given in RFC3447.
* The reason being that RFC2313#section-8.1 (PKCS#1 v1.5) states that ciphertext's encrypted by the
* private key should have the second byte set to either 0 or 1 and that ciphertext's encrypted by the
* public key should have the second byte set to 2. In RFC3447 (PKCS#1 v2.1), the second byte is supposed
- * to be 2 regardless of which key is used. for compatability purposes, we'll just check to make sure the
+ * to be 2 regardless of which key is used. For compatibility purposes, we'll just check to make sure the
* second byte is 2 or less. If it is, we'll accept the decrypted string as valid.
*
* As a consequence of this, a private key encrypted ciphertext produced with Crypt_RSA may not decrypt
@@ -1866,7 +2433,7 @@ function _rsaes_pkcs1_v1_5_decrypt($c)
// Length checking
if (strlen($c) != $this->k) { // or if k < 11
- user_error('Decryption error', E_USER_NOTICE);
+ user_error('Decryption error');
return false;
}
@@ -1876,7 +2443,7 @@ function _rsaes_pkcs1_v1_5_decrypt($c)
$m = $this->_rsadp($c);
if ($m === false) {
- user_error('Decryption error', E_USER_NOTICE);
+ user_error('Decryption error');
return false;
}
$em = $this->_i2osp($m, $this->k);
@@ -1884,7 +2451,7 @@ function _rsaes_pkcs1_v1_5_decrypt($c)
// EME-PKCS1-v1_5 decoding
if (ord($em[0]) != 0 || ord($em[1]) > 2) {
- user_error('Decryption error', E_USER_NOTICE);
+ user_error('Decryption error');
return false;
}
@@ -1892,7 +2459,7 @@ function _rsaes_pkcs1_v1_5_decrypt($c)
$m = substr($em, strlen($ps) + 3);
if (strlen($ps) < 8) {
- user_error('Decryption error', E_USER_NOTICE);
+ user_error('Decryption error');
return false;
}
@@ -1920,11 +2487,11 @@ function _emsa_pss_encode($m, $emBits)
$mHash = $this->hash->hash($m);
if ($emLen < $this->hLen + $sLen + 2) {
- user_error('Encoding error', E_USER_NOTICE);
+ user_error('Encoding error');
return false;
}
- $salt = $this->_random($sLen);
+ $salt = crypt_random_string($sLen);
$m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
$h = $this->hash->hash($m2);
$ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
@@ -1981,7 +2548,7 @@ function _emsa_pss_verify($m, $em, $emBits)
$salt = substr($db, $temp + 1); // should be $sLen long
$m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
$h2 = $this->hash->hash($m2);
- return $h == $h2;
+ return $this->_equals($h, $h2);
}
/**
@@ -2025,7 +2592,7 @@ function _rsassa_pss_verify($m, $s)
// Length checking
if (strlen($s) != $this->k) {
- user_error('Invalid signature', E_USER_NOTICE);
+ user_error('Invalid signature');
return false;
}
@@ -2036,12 +2603,12 @@ function _rsassa_pss_verify($m, $s)
$s2 = $this->_os2ip($s);
$m2 = $this->_rsavp1($s2);
if ($m2 === false) {
- user_error('Invalid signature', E_USER_NOTICE);
+ user_error('Invalid signature');
return false;
}
$em = $this->_i2osp($m2, $modBits >> 3);
if ($em === false) {
- user_error('Invalid signature', E_USER_NOTICE);
+ user_error('Invalid signature');
return false;
}
@@ -2091,7 +2658,7 @@ function _emsa_pkcs1_v1_5_encode($m, $emLen)
$tLen = strlen($t);
if ($emLen < $tLen + 11) {
- user_error('Intended encoded message length too short', E_USER_NOTICE);
+ user_error('Intended encoded message length too short');
return false;
}
@@ -2117,7 +2684,7 @@ function _rsassa_pkcs1_v1_5_sign($m)
$em = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
if ($em === false) {
- user_error('RSA modulus too short', E_USER_NOTICE);
+ user_error('RSA modulus too short');
return false;
}
@@ -2146,7 +2713,7 @@ function _rsassa_pkcs1_v1_5_verify($m, $s)
// Length checking
if (strlen($s) != $this->k) {
- user_error('Invalid signature', E_USER_NOTICE);
+ user_error('Invalid signature');
return false;
}
@@ -2155,12 +2722,12 @@ function _rsassa_pkcs1_v1_5_verify($m, $s)
$s = $this->_os2ip($s);
$m2 = $this->_rsavp1($s);
if ($m2 === false) {
- user_error('Invalid signature', E_USER_NOTICE);
+ user_error('Invalid signature');
return false;
}
$em = $this->_i2osp($m2, $this->k);
if ($em === false) {
- user_error('Invalid signature', E_USER_NOTICE);
+ user_error('Invalid signature');
return false;
}
@@ -2168,13 +2735,12 @@ function _rsassa_pkcs1_v1_5_verify($m, $s)
$em2 = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
if ($em2 === false) {
- user_error('RSA modulus too short', E_USER_NOTICE);
+ user_error('RSA modulus too short');
return false;
}
// Compare
-
- return $em === $em2;
+ return $this->_equals($em, $em2);
}
/**
@@ -2203,6 +2769,28 @@ function setSignatureMode($mode)
$this->signatureMode = $mode;
}
+ /**
+ * Set public key comment.
+ *
+ * @access public
+ * @param String $comment
+ */
+ function setComment($comment)
+ {
+ $this->comment = $comment;
+ }
+
+ /**
+ * Get public key comment.
+ *
+ * @access public
+ * @return String
+ */
+ function getComment()
+ {
+ return $this->comment;
+ }
+
/**
* Encryption
*
@@ -2261,6 +2849,8 @@ function decrypt($ciphertext)
}
$ciphertext = str_split($ciphertext, $this->k);
+ $ciphertext[count($ciphertext) - 1] = str_pad($ciphertext[count($ciphertext) - 1], $this->k, chr(0), STR_PAD_LEFT);
+
$plaintext = '';
switch ($this->encryptionMode) {
@@ -2329,4 +2919,31 @@ function verify($message, $signature)
return $this->_rsassa_pss_verify($message, $signature);
}
}
+
+ /**
+ * Extract raw BER from Base64 encoding
+ *
+ * @access private
+ * @param String $str
+ * @return String
+ */
+ function _extractBER($str)
+ {
+ /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
+ * above and beyond the ceritificate.
+ * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
+ *
+ * Bag Attributes
+ * localKeyID: 01 00 00 00
+ * subject=/O=organization/OU=org unit/CN=common name
+ * issuer=/O=organization/CN=common name
+ */
+ $temp = preg_replace('#.*?^-+[^-]+-+#ms', '', $str, 1);
+ // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
+ $temp = preg_replace('#-+[^-]+-+#', '', $temp);
+ // remove new lines
+ $temp = str_replace(array("\r", "\n", ' '), '', $temp);
+ $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
+ return $temp != false ? $temp : $str;
+ }
}
diff --git a/vendor/phpseclib/Crypt/Random.php b/vendor/phpseclib/Crypt/Random.php
index 003a3ec4c6..11e5880a0d 100644
--- a/vendor/phpseclib/Crypt/Random.php
+++ b/vendor/phpseclib/Crypt/Random.php
@@ -1,18 +1,22 @@
*
*
*
@@ -34,101 +38,85 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
- * @category Crypt
- * @package Crypt_Random
- * @author Jim Wigginton
- * @copyright MMVII Jim Wigginton
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @version $Id: Random.php,v 1.9 2010/04/24 06:40:48 terrafrost Exp $
- * @link http://phpseclib.sourceforge.net
- */
-
-/**
- * Generate a random value.
- *
- * On 32-bit machines, the largest distance that can exist between $min and $max is 2**31.
- * If $min and $max are farther apart than that then the last ($max - range) numbers.
- *
- * Depending on how this is being used, it may be worth while to write a replacement. For example,
- * a PHP-based web app that stores its data in an SQL database can collect more entropy than this function
- * can.
- *
- * @param optional Integer $min
- * @param optional Integer $max
- * @return Integer
- * @access public
+ * @category Crypt
+ * @package Crypt_Random
+ * @author Jim Wigginton
+ * @copyright MMVII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
*/
-function crypt_random($min = 0, $max = 0x7FFFFFFF)
-{
- if ($min == $max) {
- return $min;
- }
- // see http://en.wikipedia.org/wiki//dev/random
- static $urandom = true;
- if ($urandom === true) {
- // Warning's will be output unles the error suppression operator is used. Errors such as
- // "open_basedir restriction in effect", "Permission denied", "No such file or directory", etc.
- $urandom = @fopen('/dev/urandom', 'rb');
- }
- if (!is_bool($urandom)) {
- extract(unpack('Nrandom', fread($urandom, 4)));
+// laravel is a PHP framework that utilizes phpseclib. laravel workbenches may, independently,
+// have phpseclib as a requirement as well. if you're developing such a program you may encounter
+// a "Cannot redeclare crypt_random_string()" error.
+if (!function_exists('crypt_random_string')) {
+ /**
+ * "Is Windows" test
+ *
+ * @access private
+ */
+ define('CRYPT_RANDOM_IS_WINDOWS', strtoupper(substr(PHP_OS, 0, 3)) === 'WIN');
- // say $min = 0 and $max = 3. if we didn't do abs() then we could have stuff like this:
- // -4 % 3 + 0 = -1, even though -1 < $min
- return abs($random) % ($max - $min) + $min;
- }
-
- /* Prior to PHP 4.2.0, mt_srand() had to be called before mt_rand() could be called.
- Prior to PHP 5.2.6, mt_rand()'s automatic seeding was subpar, as elaborated here:
-
- http://www.suspekt.org/2008/08/17/mt_srand-and-not-so-random-numbers/
-
- The seeding routine is pretty much ripped from PHP's own internal GENERATE_SEED() macro:
-
- http://svn.php.net/viewvc/php/php-src/branches/PHP_5_3_2/ext/standard/php_rand.h?view=markup */
- if (version_compare(PHP_VERSION, '5.2.5', '<=')) {
- static $seeded;
- if (!isset($seeded)) {
- $seeded = true;
- mt_srand(fmod(time() * getmypid(), 0x7FFFFFFF) ^ fmod(1000000 * lcg_value(), 0x7FFFFFFF));
+ /**
+ * Generate a random string.
+ *
+ * Although microoptimizations are generally discouraged as they impair readability this function is ripe with
+ * microoptimizations because this function has the potential of being called a huge number of times.
+ * eg. for RSA key generation.
+ *
+ * @param Integer $length
+ * @return String
+ * @access public
+ */
+ function crypt_random_string($length)
+ {
+ if (CRYPT_RANDOM_IS_WINDOWS) {
+ // method 1. prior to PHP 5.3 this would call rand() on windows hence the function_exists('class_alias') call.
+ // ie. class_alias is a function that was introduced in PHP 5.3
+ if (function_exists('mcrypt_create_iv') && function_exists('class_alias')) {
+ return mcrypt_create_iv($length);
+ }
+ // method 2. openssl_random_pseudo_bytes was introduced in PHP 5.3.0 but prior to PHP 5.3.4 there was,
+ // to quote , "possible blocking behavior". as of 5.3.4
+ // openssl_random_pseudo_bytes and mcrypt_create_iv do the exact same thing on Windows. ie. they both
+ // call php_win32_get_random_bytes():
+ //
+ // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/openssl/openssl.c#L5008
+ // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1392
+ //
+ // php_win32_get_random_bytes() is defined thusly:
+ //
+ // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/win32/winutil.c#L80
+ //
+ // we're calling it, all the same, in the off chance that the mcrypt extension is not available
+ if (function_exists('openssl_random_pseudo_bytes') && version_compare(PHP_VERSION, '5.3.4', '>=')) {
+ return openssl_random_pseudo_bytes($length);
+ }
+ } else {
+ // method 1. the fastest
+ if (function_exists('openssl_random_pseudo_bytes')) {
+ return openssl_random_pseudo_bytes($length);
+ }
+ // method 2
+ static $fp = true;
+ if ($fp === true) {
+ // warning's will be output unles the error suppression operator is used. errors such as
+ // "open_basedir restriction in effect", "Permission denied", "No such file or directory", etc.
+ $fp = @fopen('/dev/urandom', 'rb');
+ }
+ if ($fp !== true && $fp !== false) { // surprisingly faster than !is_bool() or is_resource()
+ return fread($fp, $length);
+ }
+ // method 3. pretty much does the same thing as method 2 per the following url:
+ // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1391
+ // surprisingly slower than method 2. maybe that's because mcrypt_create_iv does a bunch of error checking that we're
+ // not doing. regardless, this'll only be called if this PHP script couldn't open /dev/urandom due to open_basedir
+ // restrictions or some such
+ if (function_exists('mcrypt_create_iv')) {
+ return mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
+ }
}
+ // Throw an exception. We can't generate a secure enough key.
+ throw new \Exception("Insufficient random abilities on this machine");
}
-
- static $crypto;
-
- // The CSPRNG's Yarrow and Fortuna periodically reseed. This function can be reseeded by hitting F5
- // in the browser and reloading the page.
-
- if (!isset($crypto)) {
- $key = $iv = '';
- for ($i = 0; $i < 8; $i++) {
- $key.= pack('n', mt_rand(0, 0xFFFF));
- $iv .= pack('n', mt_rand(0, 0xFFFF));
- }
- switch (true) {
- case class_exists('Crypt_AES'):
- $crypto = new Crypt_AES(CRYPT_AES_MODE_CTR);
- break;
- case class_exists('Crypt_TripleDES'):
- $crypto = new Crypt_TripleDES(CRYPT_DES_MODE_CTR);
- break;
- case class_exists('Crypt_DES'):
- $crypto = new Crypt_DES(CRYPT_DES_MODE_CTR);
- break;
- case class_exists('Crypt_RC4'):
- $crypto = new Crypt_RC4();
- break;
- default:
- extract(unpack('Nrandom', pack('H*', sha1(mt_rand(0, 0x7FFFFFFF)))));
- return abs($random) % ($max - $min) + $min;
- }
- $crypto->setKey($key);
- $crypto->setIV($iv);
- $crypto->enableContinuousBuffer();
- }
-
- extract(unpack('Nrandom', $crypto->encrypt("\0\0\0\0")));
- return abs($random) % ($max - $min) + $min;
}
-?>
diff --git a/vendor/phpseclib/Crypt/Rijndael.php b/vendor/phpseclib/Crypt/Rijndael.php
index 4f42315757..7858055e63 100644
--- a/vendor/phpseclib/Crypt/Rijndael.php
+++ b/vendor/phpseclib/Crypt/Rijndael.php
@@ -6,14 +6,14 @@
/**
* Pure-PHP implementation of Rijndael.
*
- * Does not use mcrypt, even when available, for reasons that are explained below.
+ * Uses mcrypt, if available/possible, and an internal implementation, otherwise.
*
* PHP versions 4 and 5
*
* If {@link Crypt_Rijndael::setBlockLength() setBlockLength()} isn't called, it'll be assumed to be 128 bits. If
* {@link Crypt_Rijndael::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
* {@link Crypt_Rijndael::setKey() setKey()}. ie. if the key is 128-bits, the key length will be 128-bits. If it's
- * 136-bits it'll be null-padded to 160-bits and 160 bits will be the key length until
+ * 136-bits it'll be null-padded to 192-bits and 192 bits will be the key length until
* {@link Crypt_Rijndael::setKey() setKey()} is called, again, at which point, it'll be recalculated.
*
* Not all Rijndael implementations may support 160-bits or 224-bits as the block length / key length. mcrypt, for example,
@@ -23,6 +23,7 @@
* are first defined as valid key / block lengths in
* {@link http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=44 Rijndael-ammended.pdf#page=44}:
* Extensions: Other block and Cipher Key lengths.
+ * Note: Use of 160/224-bit Keys must be explicitly set by setKeyLength(160) respectively setKeyLength(224).
*
* {@internal The variable names are the same as those in
* {@link http://www.csrc.nist.gov/publications/fips/fips197/fips-197.pdf#page=10 fips-197.pdf#page=10}.}}
@@ -30,7 +31,7 @@
* Here's a short example of how to use this library:
*
*
- * @copyright MMVIII Jim Wigginton
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @version $Id: Rijndael.php,v 1.12 2010/02/09 06:10:26 terrafrost Exp $
- * @link http://phpseclib.sourceforge.net
+ * @category Crypt
+ * @package Crypt_Rijndael
+ * @author Jim Wigginton
+ * @copyright MMVIII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
*/
+/**
+ * Make sure we have the base loaded
+ */
+class_exists('PHPSecLib\Crypt_Base');
+
/**#@+
* @access public
* @see Crypt_Rijndael::encrypt()
@@ -85,129 +90,100 @@
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
*/
-define('CRYPT_RIJNDAEL_MODE_CTR', -1);
+define('CRYPT_RIJNDAEL_MODE_CTR', CRYPT_MODE_CTR);
/**
* Encrypt / decrypt using the Electronic Code Book mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
*/
-define('CRYPT_RIJNDAEL_MODE_ECB', 1);
+define('CRYPT_RIJNDAEL_MODE_ECB', CRYPT_MODE_ECB);
/**
* Encrypt / decrypt using the Code Book Chaining mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
*/
-define('CRYPT_RIJNDAEL_MODE_CBC', 2);
+define('CRYPT_RIJNDAEL_MODE_CBC', CRYPT_MODE_CBC);
/**
* Encrypt / decrypt using the Cipher Feedback mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
*/
-define('CRYPT_RIJNDAEL_MODE_CFB', 3);
+define('CRYPT_RIJNDAEL_MODE_CFB', CRYPT_MODE_CFB);
/**
* Encrypt / decrypt using the Cipher Feedback mode.
*
* @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
*/
-define('CRYPT_RIJNDAEL_MODE_OFB', 4);
+define('CRYPT_RIJNDAEL_MODE_OFB', CRYPT_MODE_OFB);
/**#@-*/
/**#@+
* @access private
- * @see Crypt_Rijndael::Crypt_Rijndael()
+ * @see Crypt_Base::__construct()
*/
/**
* Toggles the internal implementation
*/
-define('CRYPT_RIJNDAEL_MODE_INTERNAL', 1);
+define('CRYPT_RIJNDAEL_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
/**
* Toggles the mcrypt implementation
*/
-define('CRYPT_RIJNDAEL_MODE_MCRYPT', 2);
+define('CRYPT_RIJNDAEL_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
/**#@-*/
/**
* Pure-PHP implementation of Rijndael.
*
+ * @package Crypt_Rijndael
* @author Jim Wigginton
- * @version 0.1.0
* @access public
- * @package Crypt_Rijndael
*/
-class Crypt_Rijndael {
+class Crypt_Rijndael extends Crypt_Base
+{
/**
- * The Encryption Mode
+ * The default password key_size used by setPassword()
*
- * @see Crypt_Rijndael::Crypt_Rijndael()
+ * @see Crypt_Base::password_key_size
+ * @see Crypt_Base::setPassword()
* @var Integer
* @access private
*/
- var $mode;
+ var $password_key_size = 16;
/**
- * The Key
+ * The namespace used by the cipher for its constants.
*
- * @see Crypt_Rijndael::setKey()
+ * @see Crypt_Base::const_namespace
* @var String
* @access private
*/
- var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+ var $const_namespace = 'RIJNDAEL';
/**
- * The Initialization Vector
+ * The mcrypt specific name of the cipher
*
- * @see Crypt_Rijndael::setIV()
- * @var String
- * @access private
- */
- var $iv = '';
-
- /**
- * A "sliding" Initialization Vector
+ * Mcrypt is useable for 128/192/256-bit $block_size/$key_size. For 160/224 not.
+ * Crypt_Rijndael determines automatically whether mcrypt is useable
+ * or not for the current $block_size/$key_size.
+ * In case of, $cipher_name_mcrypt will be set dynamically at run time accordingly.
*
- * @see Crypt_Rijndael::enableContinuousBuffer()
+ * @see Crypt_Base::cipher_name_mcrypt
+ * @see Crypt_Base::engine
+ * @see _setupEngine()
* @var String
* @access private
*/
- var $encryptIV = '';
+ var $cipher_name_mcrypt = 'rijndael-128';
/**
- * A "sliding" Initialization Vector
+ * The default salt used by setPassword()
*
- * @see Crypt_Rijndael::enableContinuousBuffer()
+ * @see Crypt_Base::password_default_salt
+ * @see Crypt_Base::setPassword()
* @var String
* @access private
*/
- var $decryptIV = '';
-
- /**
- * Continuous Buffer status
- *
- * @see Crypt_Rijndael::enableContinuousBuffer()
- * @var Boolean
- * @access private
- */
- var $continuousBuffer = false;
-
- /**
- * Padding status
- *
- * @see Crypt_Rijndael::enablePadding()
- * @var Boolean
- * @access private
- */
- var $padding = true;
-
- /**
- * Does the key schedule need to be (re)calculated?
- *
- * @see setKey()
- * @see setBlockLength()
- * @see setKeyLength()
- * @var Boolean
- * @access private
- */
- var $changed = true;
+ var $password_default_salt = 'phpseclib';
/**
* Has the key length explicitly been set or should it be derived from the key, itself?
@@ -236,17 +212,6 @@ class Crypt_Rijndael {
*/
var $dw;
- /**
- * The Block Length
- *
- * @see setBlockLength()
- * @var Integer
- * @access private
- * @internal The max value is 32, the min value is 16. All valid values are multiples of 4. Exists in conjunction with
- * $Nb because we need this value and not $Nb to pad strings appropriately.
- */
- var $block_size = 16;
-
/**
* The Block Length divided by 32
*
@@ -267,7 +232,7 @@ class Crypt_Rijndael {
* @see setKeyLength()
* @var Integer
* @access private
- * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16. Exists in conjunction with $key_size
+ * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16. Exists in conjunction with $Nk
* because the encryption / decryption / key schedule creation requires this number and not $key_size. We could
* derive this from $key_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
* of that, we'll just precompute it once.
@@ -302,225 +267,412 @@ class Crypt_Rijndael {
var $c;
/**
- * Precomputed mixColumns table
+ * Holds the last used key- and block_size information
*
- * @see Crypt_Rijndael()
* @var Array
* @access private
*/
- var $t0;
+ var $kl;
/**
* Precomputed mixColumns table
*
- * @see Crypt_Rijndael()
+ * According to (section 5.2.1),
+ * precomputed tables can be used in the mixColumns phase. in that example, they're assigned t0...t3, so
+ * those are the names we'll use.
+ *
+ * @see Crypt_Rijndael:_encryptBlock()
+ * @see Crypt_Rijndael:_decryptBlock()
* @var Array
* @access private
*/
- var $t1;
+ var $t0 = array(
+ 0xC66363A5, 0xF87C7C84, 0xEE777799, 0xF67B7B8D, 0xFFF2F20D, 0xD66B6BBD, 0xDE6F6FB1, 0x91C5C554,
+ 0x60303050, 0x02010103, 0xCE6767A9, 0x562B2B7D, 0xE7FEFE19, 0xB5D7D762, 0x4DABABE6, 0xEC76769A,
+ 0x8FCACA45, 0x1F82829D, 0x89C9C940, 0xFA7D7D87, 0xEFFAFA15, 0xB25959EB, 0x8E4747C9, 0xFBF0F00B,
+ 0x41ADADEC, 0xB3D4D467, 0x5FA2A2FD, 0x45AFAFEA, 0x239C9CBF, 0x53A4A4F7, 0xE4727296, 0x9BC0C05B,
+ 0x75B7B7C2, 0xE1FDFD1C, 0x3D9393AE, 0x4C26266A, 0x6C36365A, 0x7E3F3F41, 0xF5F7F702, 0x83CCCC4F,
+ 0x6834345C, 0x51A5A5F4, 0xD1E5E534, 0xF9F1F108, 0xE2717193, 0xABD8D873, 0x62313153, 0x2A15153F,
+ 0x0804040C, 0x95C7C752, 0x46232365, 0x9DC3C35E, 0x30181828, 0x379696A1, 0x0A05050F, 0x2F9A9AB5,
+ 0x0E070709, 0x24121236, 0x1B80809B, 0xDFE2E23D, 0xCDEBEB26, 0x4E272769, 0x7FB2B2CD, 0xEA75759F,
+ 0x1209091B, 0x1D83839E, 0x582C2C74, 0x341A1A2E, 0x361B1B2D, 0xDC6E6EB2, 0xB45A5AEE, 0x5BA0A0FB,
+ 0xA45252F6, 0x763B3B4D, 0xB7D6D661, 0x7DB3B3CE, 0x5229297B, 0xDDE3E33E, 0x5E2F2F71, 0x13848497,
+ 0xA65353F5, 0xB9D1D168, 0x00000000, 0xC1EDED2C, 0x40202060, 0xE3FCFC1F, 0x79B1B1C8, 0xB65B5BED,
+ 0xD46A6ABE, 0x8DCBCB46, 0x67BEBED9, 0x7239394B, 0x944A4ADE, 0x984C4CD4, 0xB05858E8, 0x85CFCF4A,
+ 0xBBD0D06B, 0xC5EFEF2A, 0x4FAAAAE5, 0xEDFBFB16, 0x864343C5, 0x9A4D4DD7, 0x66333355, 0x11858594,
+ 0x8A4545CF, 0xE9F9F910, 0x04020206, 0xFE7F7F81, 0xA05050F0, 0x783C3C44, 0x259F9FBA, 0x4BA8A8E3,
+ 0xA25151F3, 0x5DA3A3FE, 0x804040C0, 0x058F8F8A, 0x3F9292AD, 0x219D9DBC, 0x70383848, 0xF1F5F504,
+ 0x63BCBCDF, 0x77B6B6C1, 0xAFDADA75, 0x42212163, 0x20101030, 0xE5FFFF1A, 0xFDF3F30E, 0xBFD2D26D,
+ 0x81CDCD4C, 0x180C0C14, 0x26131335, 0xC3ECEC2F, 0xBE5F5FE1, 0x359797A2, 0x884444CC, 0x2E171739,
+ 0x93C4C457, 0x55A7A7F2, 0xFC7E7E82, 0x7A3D3D47, 0xC86464AC, 0xBA5D5DE7, 0x3219192B, 0xE6737395,
+ 0xC06060A0, 0x19818198, 0x9E4F4FD1, 0xA3DCDC7F, 0x44222266, 0x542A2A7E, 0x3B9090AB, 0x0B888883,
+ 0x8C4646CA, 0xC7EEEE29, 0x6BB8B8D3, 0x2814143C, 0xA7DEDE79, 0xBC5E5EE2, 0x160B0B1D, 0xADDBDB76,
+ 0xDBE0E03B, 0x64323256, 0x743A3A4E, 0x140A0A1E, 0x924949DB, 0x0C06060A, 0x4824246C, 0xB85C5CE4,
+ 0x9FC2C25D, 0xBDD3D36E, 0x43ACACEF, 0xC46262A6, 0x399191A8, 0x319595A4, 0xD3E4E437, 0xF279798B,
+ 0xD5E7E732, 0x8BC8C843, 0x6E373759, 0xDA6D6DB7, 0x018D8D8C, 0xB1D5D564, 0x9C4E4ED2, 0x49A9A9E0,
+ 0xD86C6CB4, 0xAC5656FA, 0xF3F4F407, 0xCFEAEA25, 0xCA6565AF, 0xF47A7A8E, 0x47AEAEE9, 0x10080818,
+ 0x6FBABAD5, 0xF0787888, 0x4A25256F, 0x5C2E2E72, 0x381C1C24, 0x57A6A6F1, 0x73B4B4C7, 0x97C6C651,
+ 0xCBE8E823, 0xA1DDDD7C, 0xE874749C, 0x3E1F1F21, 0x964B4BDD, 0x61BDBDDC, 0x0D8B8B86, 0x0F8A8A85,
+ 0xE0707090, 0x7C3E3E42, 0x71B5B5C4, 0xCC6666AA, 0x904848D8, 0x06030305, 0xF7F6F601, 0x1C0E0E12,
+ 0xC26161A3, 0x6A35355F, 0xAE5757F9, 0x69B9B9D0, 0x17868691, 0x99C1C158, 0x3A1D1D27, 0x279E9EB9,
+ 0xD9E1E138, 0xEBF8F813, 0x2B9898B3, 0x22111133, 0xD26969BB, 0xA9D9D970, 0x078E8E89, 0x339494A7,
+ 0x2D9B9BB6, 0x3C1E1E22, 0x15878792, 0xC9E9E920, 0x87CECE49, 0xAA5555FF, 0x50282878, 0xA5DFDF7A,
+ 0x038C8C8F, 0x59A1A1F8, 0x09898980, 0x1A0D0D17, 0x65BFBFDA, 0xD7E6E631, 0x844242C6, 0xD06868B8,
+ 0x824141C3, 0x299999B0, 0x5A2D2D77, 0x1E0F0F11, 0x7BB0B0CB, 0xA85454FC, 0x6DBBBBD6, 0x2C16163A
+ );
/**
* Precomputed mixColumns table
*
- * @see Crypt_Rijndael()
+ * @see Crypt_Rijndael:_encryptBlock()
+ * @see Crypt_Rijndael:_decryptBlock()
* @var Array
* @access private
*/
- var $t2;
+ var $t1 = array(
+ 0xA5C66363, 0x84F87C7C, 0x99EE7777, 0x8DF67B7B, 0x0DFFF2F2, 0xBDD66B6B, 0xB1DE6F6F, 0x5491C5C5,
+ 0x50603030, 0x03020101, 0xA9CE6767, 0x7D562B2B, 0x19E7FEFE, 0x62B5D7D7, 0xE64DABAB, 0x9AEC7676,
+ 0x458FCACA, 0x9D1F8282, 0x4089C9C9, 0x87FA7D7D, 0x15EFFAFA, 0xEBB25959, 0xC98E4747, 0x0BFBF0F0,
+ 0xEC41ADAD, 0x67B3D4D4, 0xFD5FA2A2, 0xEA45AFAF, 0xBF239C9C, 0xF753A4A4, 0x96E47272, 0x5B9BC0C0,
+ 0xC275B7B7, 0x1CE1FDFD, 0xAE3D9393, 0x6A4C2626, 0x5A6C3636, 0x417E3F3F, 0x02F5F7F7, 0x4F83CCCC,
+ 0x5C683434, 0xF451A5A5, 0x34D1E5E5, 0x08F9F1F1, 0x93E27171, 0x73ABD8D8, 0x53623131, 0x3F2A1515,
+ 0x0C080404, 0x5295C7C7, 0x65462323, 0x5E9DC3C3, 0x28301818, 0xA1379696, 0x0F0A0505, 0xB52F9A9A,
+ 0x090E0707, 0x36241212, 0x9B1B8080, 0x3DDFE2E2, 0x26CDEBEB, 0x694E2727, 0xCD7FB2B2, 0x9FEA7575,
+ 0x1B120909, 0x9E1D8383, 0x74582C2C, 0x2E341A1A, 0x2D361B1B, 0xB2DC6E6E, 0xEEB45A5A, 0xFB5BA0A0,
+ 0xF6A45252, 0x4D763B3B, 0x61B7D6D6, 0xCE7DB3B3, 0x7B522929, 0x3EDDE3E3, 0x715E2F2F, 0x97138484,
+ 0xF5A65353, 0x68B9D1D1, 0x00000000, 0x2CC1EDED, 0x60402020, 0x1FE3FCFC, 0xC879B1B1, 0xEDB65B5B,
+ 0xBED46A6A, 0x468DCBCB, 0xD967BEBE, 0x4B723939, 0xDE944A4A, 0xD4984C4C, 0xE8B05858, 0x4A85CFCF,
+ 0x6BBBD0D0, 0x2AC5EFEF, 0xE54FAAAA, 0x16EDFBFB, 0xC5864343, 0xD79A4D4D, 0x55663333, 0x94118585,
+ 0xCF8A4545, 0x10E9F9F9, 0x06040202, 0x81FE7F7F, 0xF0A05050, 0x44783C3C, 0xBA259F9F, 0xE34BA8A8,
+ 0xF3A25151, 0xFE5DA3A3, 0xC0804040, 0x8A058F8F, 0xAD3F9292, 0xBC219D9D, 0x48703838, 0x04F1F5F5,
+ 0xDF63BCBC, 0xC177B6B6, 0x75AFDADA, 0x63422121, 0x30201010, 0x1AE5FFFF, 0x0EFDF3F3, 0x6DBFD2D2,
+ 0x4C81CDCD, 0x14180C0C, 0x35261313, 0x2FC3ECEC, 0xE1BE5F5F, 0xA2359797, 0xCC884444, 0x392E1717,
+ 0x5793C4C4, 0xF255A7A7, 0x82FC7E7E, 0x477A3D3D, 0xACC86464, 0xE7BA5D5D, 0x2B321919, 0x95E67373,
+ 0xA0C06060, 0x98198181, 0xD19E4F4F, 0x7FA3DCDC, 0x66442222, 0x7E542A2A, 0xAB3B9090, 0x830B8888,
+ 0xCA8C4646, 0x29C7EEEE, 0xD36BB8B8, 0x3C281414, 0x79A7DEDE, 0xE2BC5E5E, 0x1D160B0B, 0x76ADDBDB,
+ 0x3BDBE0E0, 0x56643232, 0x4E743A3A, 0x1E140A0A, 0xDB924949, 0x0A0C0606, 0x6C482424, 0xE4B85C5C,
+ 0x5D9FC2C2, 0x6EBDD3D3, 0xEF43ACAC, 0xA6C46262, 0xA8399191, 0xA4319595, 0x37D3E4E4, 0x8BF27979,
+ 0x32D5E7E7, 0x438BC8C8, 0x596E3737, 0xB7DA6D6D, 0x8C018D8D, 0x64B1D5D5, 0xD29C4E4E, 0xE049A9A9,
+ 0xB4D86C6C, 0xFAAC5656, 0x07F3F4F4, 0x25CFEAEA, 0xAFCA6565, 0x8EF47A7A, 0xE947AEAE, 0x18100808,
+ 0xD56FBABA, 0x88F07878, 0x6F4A2525, 0x725C2E2E, 0x24381C1C, 0xF157A6A6, 0xC773B4B4, 0x5197C6C6,
+ 0x23CBE8E8, 0x7CA1DDDD, 0x9CE87474, 0x213E1F1F, 0xDD964B4B, 0xDC61BDBD, 0x860D8B8B, 0x850F8A8A,
+ 0x90E07070, 0x427C3E3E, 0xC471B5B5, 0xAACC6666, 0xD8904848, 0x05060303, 0x01F7F6F6, 0x121C0E0E,
+ 0xA3C26161, 0x5F6A3535, 0xF9AE5757, 0xD069B9B9, 0x91178686, 0x5899C1C1, 0x273A1D1D, 0xB9279E9E,
+ 0x38D9E1E1, 0x13EBF8F8, 0xB32B9898, 0x33221111, 0xBBD26969, 0x70A9D9D9, 0x89078E8E, 0xA7339494,
+ 0xB62D9B9B, 0x223C1E1E, 0x92158787, 0x20C9E9E9, 0x4987CECE, 0xFFAA5555, 0x78502828, 0x7AA5DFDF,
+ 0x8F038C8C, 0xF859A1A1, 0x80098989, 0x171A0D0D, 0xDA65BFBF, 0x31D7E6E6, 0xC6844242, 0xB8D06868,
+ 0xC3824141, 0xB0299999, 0x775A2D2D, 0x111E0F0F, 0xCB7BB0B0, 0xFCA85454, 0xD66DBBBB, 0x3A2C1616
+ );
/**
* Precomputed mixColumns table
*
- * @see Crypt_Rijndael()
+ * @see Crypt_Rijndael:_encryptBlock()
+ * @see Crypt_Rijndael:_decryptBlock()
* @var Array
* @access private
*/
- var $t3;
+ var $t2 = array(
+ 0x63A5C663, 0x7C84F87C, 0x7799EE77, 0x7B8DF67B, 0xF20DFFF2, 0x6BBDD66B, 0x6FB1DE6F, 0xC55491C5,
+ 0x30506030, 0x01030201, 0x67A9CE67, 0x2B7D562B, 0xFE19E7FE, 0xD762B5D7, 0xABE64DAB, 0x769AEC76,
+ 0xCA458FCA, 0x829D1F82, 0xC94089C9, 0x7D87FA7D, 0xFA15EFFA, 0x59EBB259, 0x47C98E47, 0xF00BFBF0,
+ 0xADEC41AD, 0xD467B3D4, 0xA2FD5FA2, 0xAFEA45AF, 0x9CBF239C, 0xA4F753A4, 0x7296E472, 0xC05B9BC0,
+ 0xB7C275B7, 0xFD1CE1FD, 0x93AE3D93, 0x266A4C26, 0x365A6C36, 0x3F417E3F, 0xF702F5F7, 0xCC4F83CC,
+ 0x345C6834, 0xA5F451A5, 0xE534D1E5, 0xF108F9F1, 0x7193E271, 0xD873ABD8, 0x31536231, 0x153F2A15,
+ 0x040C0804, 0xC75295C7, 0x23654623, 0xC35E9DC3, 0x18283018, 0x96A13796, 0x050F0A05, 0x9AB52F9A,
+ 0x07090E07, 0x12362412, 0x809B1B80, 0xE23DDFE2, 0xEB26CDEB, 0x27694E27, 0xB2CD7FB2, 0x759FEA75,
+ 0x091B1209, 0x839E1D83, 0x2C74582C, 0x1A2E341A, 0x1B2D361B, 0x6EB2DC6E, 0x5AEEB45A, 0xA0FB5BA0,
+ 0x52F6A452, 0x3B4D763B, 0xD661B7D6, 0xB3CE7DB3, 0x297B5229, 0xE33EDDE3, 0x2F715E2F, 0x84971384,
+ 0x53F5A653, 0xD168B9D1, 0x00000000, 0xED2CC1ED, 0x20604020, 0xFC1FE3FC, 0xB1C879B1, 0x5BEDB65B,
+ 0x6ABED46A, 0xCB468DCB, 0xBED967BE, 0x394B7239, 0x4ADE944A, 0x4CD4984C, 0x58E8B058, 0xCF4A85CF,
+ 0xD06BBBD0, 0xEF2AC5EF, 0xAAE54FAA, 0xFB16EDFB, 0x43C58643, 0x4DD79A4D, 0x33556633, 0x85941185,
+ 0x45CF8A45, 0xF910E9F9, 0x02060402, 0x7F81FE7F, 0x50F0A050, 0x3C44783C, 0x9FBA259F, 0xA8E34BA8,
+ 0x51F3A251, 0xA3FE5DA3, 0x40C08040, 0x8F8A058F, 0x92AD3F92, 0x9DBC219D, 0x38487038, 0xF504F1F5,
+ 0xBCDF63BC, 0xB6C177B6, 0xDA75AFDA, 0x21634221, 0x10302010, 0xFF1AE5FF, 0xF30EFDF3, 0xD26DBFD2,
+ 0xCD4C81CD, 0x0C14180C, 0x13352613, 0xEC2FC3EC, 0x5FE1BE5F, 0x97A23597, 0x44CC8844, 0x17392E17,
+ 0xC45793C4, 0xA7F255A7, 0x7E82FC7E, 0x3D477A3D, 0x64ACC864, 0x5DE7BA5D, 0x192B3219, 0x7395E673,
+ 0x60A0C060, 0x81981981, 0x4FD19E4F, 0xDC7FA3DC, 0x22664422, 0x2A7E542A, 0x90AB3B90, 0x88830B88,
+ 0x46CA8C46, 0xEE29C7EE, 0xB8D36BB8, 0x143C2814, 0xDE79A7DE, 0x5EE2BC5E, 0x0B1D160B, 0xDB76ADDB,
+ 0xE03BDBE0, 0x32566432, 0x3A4E743A, 0x0A1E140A, 0x49DB9249, 0x060A0C06, 0x246C4824, 0x5CE4B85C,
+ 0xC25D9FC2, 0xD36EBDD3, 0xACEF43AC, 0x62A6C462, 0x91A83991, 0x95A43195, 0xE437D3E4, 0x798BF279,
+ 0xE732D5E7, 0xC8438BC8, 0x37596E37, 0x6DB7DA6D, 0x8D8C018D, 0xD564B1D5, 0x4ED29C4E, 0xA9E049A9,
+ 0x6CB4D86C, 0x56FAAC56, 0xF407F3F4, 0xEA25CFEA, 0x65AFCA65, 0x7A8EF47A, 0xAEE947AE, 0x08181008,
+ 0xBAD56FBA, 0x7888F078, 0x256F4A25, 0x2E725C2E, 0x1C24381C, 0xA6F157A6, 0xB4C773B4, 0xC65197C6,
+ 0xE823CBE8, 0xDD7CA1DD, 0x749CE874, 0x1F213E1F, 0x4BDD964B, 0xBDDC61BD, 0x8B860D8B, 0x8A850F8A,
+ 0x7090E070, 0x3E427C3E, 0xB5C471B5, 0x66AACC66, 0x48D89048, 0x03050603, 0xF601F7F6, 0x0E121C0E,
+ 0x61A3C261, 0x355F6A35, 0x57F9AE57, 0xB9D069B9, 0x86911786, 0xC15899C1, 0x1D273A1D, 0x9EB9279E,
+ 0xE138D9E1, 0xF813EBF8, 0x98B32B98, 0x11332211, 0x69BBD269, 0xD970A9D9, 0x8E89078E, 0x94A73394,
+ 0x9BB62D9B, 0x1E223C1E, 0x87921587, 0xE920C9E9, 0xCE4987CE, 0x55FFAA55, 0x28785028, 0xDF7AA5DF,
+ 0x8C8F038C, 0xA1F859A1, 0x89800989, 0x0D171A0D, 0xBFDA65BF, 0xE631D7E6, 0x42C68442, 0x68B8D068,
+ 0x41C38241, 0x99B02999, 0x2D775A2D, 0x0F111E0F, 0xB0CB7BB0, 0x54FCA854, 0xBBD66DBB, 0x163A2C16
+ );
/**
- * Precomputed invMixColumns table
+ * Precomputed mixColumns table
*
- * @see Crypt_Rijndael()
+ * @see Crypt_Rijndael:_encryptBlock()
+ * @see Crypt_Rijndael:_decryptBlock()
* @var Array
* @access private
*/
- var $dt0;
+ var $t3 = array(
+ 0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491,
+ 0x30305060, 0x01010302, 0x6767A9CE, 0x2B2B7D56, 0xFEFE19E7, 0xD7D762B5, 0xABABE64D, 0x76769AEC,
+ 0xCACA458F, 0x82829D1F, 0xC9C94089, 0x7D7D87FA, 0xFAFA15EF, 0x5959EBB2, 0x4747C98E, 0xF0F00BFB,
+ 0xADADEC41, 0xD4D467B3, 0xA2A2FD5F, 0xAFAFEA45, 0x9C9CBF23, 0xA4A4F753, 0x727296E4, 0xC0C05B9B,
+ 0xB7B7C275, 0xFDFD1CE1, 0x9393AE3D, 0x26266A4C, 0x36365A6C, 0x3F3F417E, 0xF7F702F5, 0xCCCC4F83,
+ 0x34345C68, 0xA5A5F451, 0xE5E534D1, 0xF1F108F9, 0x717193E2, 0xD8D873AB, 0x31315362, 0x15153F2A,
+ 0x04040C08, 0xC7C75295, 0x23236546, 0xC3C35E9D, 0x18182830, 0x9696A137, 0x05050F0A, 0x9A9AB52F,
+ 0x0707090E, 0x12123624, 0x80809B1B, 0xE2E23DDF, 0xEBEB26CD, 0x2727694E, 0xB2B2CD7F, 0x75759FEA,
+ 0x09091B12, 0x83839E1D, 0x2C2C7458, 0x1A1A2E34, 0x1B1B2D36, 0x6E6EB2DC, 0x5A5AEEB4, 0xA0A0FB5B,
+ 0x5252F6A4, 0x3B3B4D76, 0xD6D661B7, 0xB3B3CE7D, 0x29297B52, 0xE3E33EDD, 0x2F2F715E, 0x84849713,
+ 0x5353F5A6, 0xD1D168B9, 0x00000000, 0xEDED2CC1, 0x20206040, 0xFCFC1FE3, 0xB1B1C879, 0x5B5BEDB6,
+ 0x6A6ABED4, 0xCBCB468D, 0xBEBED967, 0x39394B72, 0x4A4ADE94, 0x4C4CD498, 0x5858E8B0, 0xCFCF4A85,
+ 0xD0D06BBB, 0xEFEF2AC5, 0xAAAAE54F, 0xFBFB16ED, 0x4343C586, 0x4D4DD79A, 0x33335566, 0x85859411,
+ 0x4545CF8A, 0xF9F910E9, 0x02020604, 0x7F7F81FE, 0x5050F0A0, 0x3C3C4478, 0x9F9FBA25, 0xA8A8E34B,
+ 0x5151F3A2, 0xA3A3FE5D, 0x4040C080, 0x8F8F8A05, 0x9292AD3F, 0x9D9DBC21, 0x38384870, 0xF5F504F1,
+ 0xBCBCDF63, 0xB6B6C177, 0xDADA75AF, 0x21216342, 0x10103020, 0xFFFF1AE5, 0xF3F30EFD, 0xD2D26DBF,
+ 0xCDCD4C81, 0x0C0C1418, 0x13133526, 0xECEC2FC3, 0x5F5FE1BE, 0x9797A235, 0x4444CC88, 0x1717392E,
+ 0xC4C45793, 0xA7A7F255, 0x7E7E82FC, 0x3D3D477A, 0x6464ACC8, 0x5D5DE7BA, 0x19192B32, 0x737395E6,
+ 0x6060A0C0, 0x81819819, 0x4F4FD19E, 0xDCDC7FA3, 0x22226644, 0x2A2A7E54, 0x9090AB3B, 0x8888830B,
+ 0x4646CA8C, 0xEEEE29C7, 0xB8B8D36B, 0x14143C28, 0xDEDE79A7, 0x5E5EE2BC, 0x0B0B1D16, 0xDBDB76AD,
+ 0xE0E03BDB, 0x32325664, 0x3A3A4E74, 0x0A0A1E14, 0x4949DB92, 0x06060A0C, 0x24246C48, 0x5C5CE4B8,
+ 0xC2C25D9F, 0xD3D36EBD, 0xACACEF43, 0x6262A6C4, 0x9191A839, 0x9595A431, 0xE4E437D3, 0x79798BF2,
+ 0xE7E732D5, 0xC8C8438B, 0x3737596E, 0x6D6DB7DA, 0x8D8D8C01, 0xD5D564B1, 0x4E4ED29C, 0xA9A9E049,
+ 0x6C6CB4D8, 0x5656FAAC, 0xF4F407F3, 0xEAEA25CF, 0x6565AFCA, 0x7A7A8EF4, 0xAEAEE947, 0x08081810,
+ 0xBABAD56F, 0x787888F0, 0x25256F4A, 0x2E2E725C, 0x1C1C2438, 0xA6A6F157, 0xB4B4C773, 0xC6C65197,
+ 0xE8E823CB, 0xDDDD7CA1, 0x74749CE8, 0x1F1F213E, 0x4B4BDD96, 0xBDBDDC61, 0x8B8B860D, 0x8A8A850F,
+ 0x707090E0, 0x3E3E427C, 0xB5B5C471, 0x6666AACC, 0x4848D890, 0x03030506, 0xF6F601F7, 0x0E0E121C,
+ 0x6161A3C2, 0x35355F6A, 0x5757F9AE, 0xB9B9D069, 0x86869117, 0xC1C15899, 0x1D1D273A, 0x9E9EB927,
+ 0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733,
+ 0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5,
+ 0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0,
+ 0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
+ );
/**
* Precomputed invMixColumns table
*
- * @see Crypt_Rijndael()
+ * @see Crypt_Rijndael:_encryptBlock()
+ * @see Crypt_Rijndael:_decryptBlock()
* @var Array
* @access private
*/
- var $dt1;
+ var $dt0 = array(
+ 0x51F4A750, 0x7E416553, 0x1A17A4C3, 0x3A275E96, 0x3BAB6BCB, 0x1F9D45F1, 0xACFA58AB, 0x4BE30393,
+ 0x2030FA55, 0xAD766DF6, 0x88CC7691, 0xF5024C25, 0x4FE5D7FC, 0xC52ACBD7, 0x26354480, 0xB562A38F,
+ 0xDEB15A49, 0x25BA1B67, 0x45EA0E98, 0x5DFEC0E1, 0xC32F7502, 0x814CF012, 0x8D4697A3, 0x6BD3F9C6,
+ 0x038F5FE7, 0x15929C95, 0xBF6D7AEB, 0x955259DA, 0xD4BE832D, 0x587421D3, 0x49E06929, 0x8EC9C844,
+ 0x75C2896A, 0xF48E7978, 0x99583E6B, 0x27B971DD, 0xBEE14FB6, 0xF088AD17, 0xC920AC66, 0x7DCE3AB4,
+ 0x63DF4A18, 0xE51A3182, 0x97513360, 0x62537F45, 0xB16477E0, 0xBB6BAE84, 0xFE81A01C, 0xF9082B94,
+ 0x70486858, 0x8F45FD19, 0x94DE6C87, 0x527BF8B7, 0xAB73D323, 0x724B02E2, 0xE31F8F57, 0x6655AB2A,
+ 0xB2EB2807, 0x2FB5C203, 0x86C57B9A, 0xD33708A5, 0x302887F2, 0x23BFA5B2, 0x02036ABA, 0xED16825C,
+ 0x8ACF1C2B, 0xA779B492, 0xF307F2F0, 0x4E69E2A1, 0x65DAF4CD, 0x0605BED5, 0xD134621F, 0xC4A6FE8A,
+ 0x342E539D, 0xA2F355A0, 0x058AE132, 0xA4F6EB75, 0x0B83EC39, 0x4060EFAA, 0x5E719F06, 0xBD6E1051,
+ 0x3E218AF9, 0x96DD063D, 0xDD3E05AE, 0x4DE6BD46, 0x91548DB5, 0x71C45D05, 0x0406D46F, 0x605015FF,
+ 0x1998FB24, 0xD6BDE997, 0x894043CC, 0x67D99E77, 0xB0E842BD, 0x07898B88, 0xE7195B38, 0x79C8EEDB,
+ 0xA17C0A47, 0x7C420FE9, 0xF8841EC9, 0x00000000, 0x09808683, 0x322BED48, 0x1E1170AC, 0x6C5A724E,
+ 0xFD0EFFFB, 0x0F853856, 0x3DAED51E, 0x362D3927, 0x0A0FD964, 0x685CA621, 0x9B5B54D1, 0x24362E3A,
+ 0x0C0A67B1, 0x9357E70F, 0xB4EE96D2, 0x1B9B919E, 0x80C0C54F, 0x61DC20A2, 0x5A774B69, 0x1C121A16,
+ 0xE293BA0A, 0xC0A02AE5, 0x3C22E043, 0x121B171D, 0x0E090D0B, 0xF28BC7AD, 0x2DB6A8B9, 0x141EA9C8,
+ 0x57F11985, 0xAF75074C, 0xEE99DDBB, 0xA37F60FD, 0xF701269F, 0x5C72F5BC, 0x44663BC5, 0x5BFB7E34,
+ 0x8B432976, 0xCB23C6DC, 0xB6EDFC68, 0xB8E4F163, 0xD731DCCA, 0x42638510, 0x13972240, 0x84C61120,
+ 0x854A247D, 0xD2BB3DF8, 0xAEF93211, 0xC729A16D, 0x1D9E2F4B, 0xDCB230F3, 0x0D8652EC, 0x77C1E3D0,
+ 0x2BB3166C, 0xA970B999, 0x119448FA, 0x47E96422, 0xA8FC8CC4, 0xA0F03F1A, 0x567D2CD8, 0x223390EF,
+ 0x87494EC7, 0xD938D1C1, 0x8CCAA2FE, 0x98D40B36, 0xA6F581CF, 0xA57ADE28, 0xDAB78E26, 0x3FADBFA4,
+ 0x2C3A9DE4, 0x5078920D, 0x6A5FCC9B, 0x547E4662, 0xF68D13C2, 0x90D8B8E8, 0x2E39F75E, 0x82C3AFF5,
+ 0x9F5D80BE, 0x69D0937C, 0x6FD52DA9, 0xCF2512B3, 0xC8AC993B, 0x10187DA7, 0xE89C636E, 0xDB3BBB7B,
+ 0xCD267809, 0x6E5918F4, 0xEC9AB701, 0x834F9AA8, 0xE6956E65, 0xAAFFE67E, 0x21BCCF08, 0xEF15E8E6,
+ 0xBAE79BD9, 0x4A6F36CE, 0xEA9F09D4, 0x29B07CD6, 0x31A4B2AF, 0x2A3F2331, 0xC6A59430, 0x35A266C0,
+ 0x744EBC37, 0xFC82CAA6, 0xE090D0B0, 0x33A7D815, 0xF104984A, 0x41ECDAF7, 0x7FCD500E, 0x1791F62F,
+ 0x764DD68D, 0x43EFB04D, 0xCCAA4D54, 0xE49604DF, 0x9ED1B5E3, 0x4C6A881B, 0xC12C1FB8, 0x4665517F,
+ 0x9D5EEA04, 0x018C355D, 0xFA877473, 0xFB0B412E, 0xB3671D5A, 0x92DBD252, 0xE9105633, 0x6DD64713,
+ 0x9AD7618C, 0x37A10C7A, 0x59F8148E, 0xEB133C89, 0xCEA927EE, 0xB761C935, 0xE11CE5ED, 0x7A47B13C,
+ 0x9CD2DF59, 0x55F2733F, 0x1814CE79, 0x73C737BF, 0x53F7CDEA, 0x5FFDAA5B, 0xDF3D6F14, 0x7844DB86,
+ 0xCAAFF381, 0xB968C43E, 0x3824342C, 0xC2A3405F, 0x161DC372, 0xBCE2250C, 0x283C498B, 0xFF0D9541,
+ 0x39A80171, 0x080CB3DE, 0xD8B4E49C, 0x6456C190, 0x7BCB8461, 0xD532B670, 0x486C5C74, 0xD0B85742
+ );
/**
* Precomputed invMixColumns table
*
- * @see Crypt_Rijndael()
+ * @see Crypt_Rijndael:_encryptBlock()
+ * @see Crypt_Rijndael:_decryptBlock()
* @var Array
* @access private
*/
- var $dt2;
+ var $dt1 = array(
+ 0x5051F4A7, 0x537E4165, 0xC31A17A4, 0x963A275E, 0xCB3BAB6B, 0xF11F9D45, 0xABACFA58, 0x934BE303,
+ 0x552030FA, 0xF6AD766D, 0x9188CC76, 0x25F5024C, 0xFC4FE5D7, 0xD7C52ACB, 0x80263544, 0x8FB562A3,
+ 0x49DEB15A, 0x6725BA1B, 0x9845EA0E, 0xE15DFEC0, 0x02C32F75, 0x12814CF0, 0xA38D4697, 0xC66BD3F9,
+ 0xE7038F5F, 0x9515929C, 0xEBBF6D7A, 0xDA955259, 0x2DD4BE83, 0xD3587421, 0x2949E069, 0x448EC9C8,
+ 0x6A75C289, 0x78F48E79, 0x6B99583E, 0xDD27B971, 0xB6BEE14F, 0x17F088AD, 0x66C920AC, 0xB47DCE3A,
+ 0x1863DF4A, 0x82E51A31, 0x60975133, 0x4562537F, 0xE0B16477, 0x84BB6BAE, 0x1CFE81A0, 0x94F9082B,
+ 0x58704868, 0x198F45FD, 0x8794DE6C, 0xB7527BF8, 0x23AB73D3, 0xE2724B02, 0x57E31F8F, 0x2A6655AB,
+ 0x07B2EB28, 0x032FB5C2, 0x9A86C57B, 0xA5D33708, 0xF2302887, 0xB223BFA5, 0xBA02036A, 0x5CED1682,
+ 0x2B8ACF1C, 0x92A779B4, 0xF0F307F2, 0xA14E69E2, 0xCD65DAF4, 0xD50605BE, 0x1FD13462, 0x8AC4A6FE,
+ 0x9D342E53, 0xA0A2F355, 0x32058AE1, 0x75A4F6EB, 0x390B83EC, 0xAA4060EF, 0x065E719F, 0x51BD6E10,
+ 0xF93E218A, 0x3D96DD06, 0xAEDD3E05, 0x464DE6BD, 0xB591548D, 0x0571C45D, 0x6F0406D4, 0xFF605015,
+ 0x241998FB, 0x97D6BDE9, 0xCC894043, 0x7767D99E, 0xBDB0E842, 0x8807898B, 0x38E7195B, 0xDB79C8EE,
+ 0x47A17C0A, 0xE97C420F, 0xC9F8841E, 0x00000000, 0x83098086, 0x48322BED, 0xAC1E1170, 0x4E6C5A72,
+ 0xFBFD0EFF, 0x560F8538, 0x1E3DAED5, 0x27362D39, 0x640A0FD9, 0x21685CA6, 0xD19B5B54, 0x3A24362E,
+ 0xB10C0A67, 0x0F9357E7, 0xD2B4EE96, 0x9E1B9B91, 0x4F80C0C5, 0xA261DC20, 0x695A774B, 0x161C121A,
+ 0x0AE293BA, 0xE5C0A02A, 0x433C22E0, 0x1D121B17, 0x0B0E090D, 0xADF28BC7, 0xB92DB6A8, 0xC8141EA9,
+ 0x8557F119, 0x4CAF7507, 0xBBEE99DD, 0xFDA37F60, 0x9FF70126, 0xBC5C72F5, 0xC544663B, 0x345BFB7E,
+ 0x768B4329, 0xDCCB23C6, 0x68B6EDFC, 0x63B8E4F1, 0xCAD731DC, 0x10426385, 0x40139722, 0x2084C611,
+ 0x7D854A24, 0xF8D2BB3D, 0x11AEF932, 0x6DC729A1, 0x4B1D9E2F, 0xF3DCB230, 0xEC0D8652, 0xD077C1E3,
+ 0x6C2BB316, 0x99A970B9, 0xFA119448, 0x2247E964, 0xC4A8FC8C, 0x1AA0F03F, 0xD8567D2C, 0xEF223390,
+ 0xC787494E, 0xC1D938D1, 0xFE8CCAA2, 0x3698D40B, 0xCFA6F581, 0x28A57ADE, 0x26DAB78E, 0xA43FADBF,
+ 0xE42C3A9D, 0x0D507892, 0x9B6A5FCC, 0x62547E46, 0xC2F68D13, 0xE890D8B8, 0x5E2E39F7, 0xF582C3AF,
+ 0xBE9F5D80, 0x7C69D093, 0xA96FD52D, 0xB3CF2512, 0x3BC8AC99, 0xA710187D, 0x6EE89C63, 0x7BDB3BBB,
+ 0x09CD2678, 0xF46E5918, 0x01EC9AB7, 0xA8834F9A, 0x65E6956E, 0x7EAAFFE6, 0x0821BCCF, 0xE6EF15E8,
+ 0xD9BAE79B, 0xCE4A6F36, 0xD4EA9F09, 0xD629B07C, 0xAF31A4B2, 0x312A3F23, 0x30C6A594, 0xC035A266,
+ 0x37744EBC, 0xA6FC82CA, 0xB0E090D0, 0x1533A7D8, 0x4AF10498, 0xF741ECDA, 0x0E7FCD50, 0x2F1791F6,
+ 0x8D764DD6, 0x4D43EFB0, 0x54CCAA4D, 0xDFE49604, 0xE39ED1B5, 0x1B4C6A88, 0xB8C12C1F, 0x7F466551,
+ 0x049D5EEA, 0x5D018C35, 0x73FA8774, 0x2EFB0B41, 0x5AB3671D, 0x5292DBD2, 0x33E91056, 0x136DD647,
+ 0x8C9AD761, 0x7A37A10C, 0x8E59F814, 0x89EB133C, 0xEECEA927, 0x35B761C9, 0xEDE11CE5, 0x3C7A47B1,
+ 0x599CD2DF, 0x3F55F273, 0x791814CE, 0xBF73C737, 0xEA53F7CD, 0x5B5FFDAA, 0x14DF3D6F, 0x867844DB,
+ 0x81CAAFF3, 0x3EB968C4, 0x2C382434, 0x5FC2A340, 0x72161DC3, 0x0CBCE225, 0x8B283C49, 0x41FF0D95,
+ 0x7139A801, 0xDE080CB3, 0x9CD8B4E4, 0x906456C1, 0x617BCB84, 0x70D532B6, 0x74486C5C, 0x42D0B857
+ );
/**
* Precomputed invMixColumns table
*
- * @see Crypt_Rijndael()
+ * @see Crypt_Rijndael:_encryptBlock()
+ * @see Crypt_Rijndael:_decryptBlock()
* @var Array
* @access private
*/
- var $dt3;
+ var $dt2 = array(
+ 0xA75051F4, 0x65537E41, 0xA4C31A17, 0x5E963A27, 0x6BCB3BAB, 0x45F11F9D, 0x58ABACFA, 0x03934BE3,
+ 0xFA552030, 0x6DF6AD76, 0x769188CC, 0x4C25F502, 0xD7FC4FE5, 0xCBD7C52A, 0x44802635, 0xA38FB562,
+ 0x5A49DEB1, 0x1B6725BA, 0x0E9845EA, 0xC0E15DFE, 0x7502C32F, 0xF012814C, 0x97A38D46, 0xF9C66BD3,
+ 0x5FE7038F, 0x9C951592, 0x7AEBBF6D, 0x59DA9552, 0x832DD4BE, 0x21D35874, 0x692949E0, 0xC8448EC9,
+ 0x896A75C2, 0x7978F48E, 0x3E6B9958, 0x71DD27B9, 0x4FB6BEE1, 0xAD17F088, 0xAC66C920, 0x3AB47DCE,
+ 0x4A1863DF, 0x3182E51A, 0x33609751, 0x7F456253, 0x77E0B164, 0xAE84BB6B, 0xA01CFE81, 0x2B94F908,
+ 0x68587048, 0xFD198F45, 0x6C8794DE, 0xF8B7527B, 0xD323AB73, 0x02E2724B, 0x8F57E31F, 0xAB2A6655,
+ 0x2807B2EB, 0xC2032FB5, 0x7B9A86C5, 0x08A5D337, 0x87F23028, 0xA5B223BF, 0x6ABA0203, 0x825CED16,
+ 0x1C2B8ACF, 0xB492A779, 0xF2F0F307, 0xE2A14E69, 0xF4CD65DA, 0xBED50605, 0x621FD134, 0xFE8AC4A6,
+ 0x539D342E, 0x55A0A2F3, 0xE132058A, 0xEB75A4F6, 0xEC390B83, 0xEFAA4060, 0x9F065E71, 0x1051BD6E,
+ 0x8AF93E21, 0x063D96DD, 0x05AEDD3E, 0xBD464DE6, 0x8DB59154, 0x5D0571C4, 0xD46F0406, 0x15FF6050,
+ 0xFB241998, 0xE997D6BD, 0x43CC8940, 0x9E7767D9, 0x42BDB0E8, 0x8B880789, 0x5B38E719, 0xEEDB79C8,
+ 0x0A47A17C, 0x0FE97C42, 0x1EC9F884, 0x00000000, 0x86830980, 0xED48322B, 0x70AC1E11, 0x724E6C5A,
+ 0xFFFBFD0E, 0x38560F85, 0xD51E3DAE, 0x3927362D, 0xD9640A0F, 0xA621685C, 0x54D19B5B, 0x2E3A2436,
+ 0x67B10C0A, 0xE70F9357, 0x96D2B4EE, 0x919E1B9B, 0xC54F80C0, 0x20A261DC, 0x4B695A77, 0x1A161C12,
+ 0xBA0AE293, 0x2AE5C0A0, 0xE0433C22, 0x171D121B, 0x0D0B0E09, 0xC7ADF28B, 0xA8B92DB6, 0xA9C8141E,
+ 0x198557F1, 0x074CAF75, 0xDDBBEE99, 0x60FDA37F, 0x269FF701, 0xF5BC5C72, 0x3BC54466, 0x7E345BFB,
+ 0x29768B43, 0xC6DCCB23, 0xFC68B6ED, 0xF163B8E4, 0xDCCAD731, 0x85104263, 0x22401397, 0x112084C6,
+ 0x247D854A, 0x3DF8D2BB, 0x3211AEF9, 0xA16DC729, 0x2F4B1D9E, 0x30F3DCB2, 0x52EC0D86, 0xE3D077C1,
+ 0x166C2BB3, 0xB999A970, 0x48FA1194, 0x642247E9, 0x8CC4A8FC, 0x3F1AA0F0, 0x2CD8567D, 0x90EF2233,
+ 0x4EC78749, 0xD1C1D938, 0xA2FE8CCA, 0x0B3698D4, 0x81CFA6F5, 0xDE28A57A, 0x8E26DAB7, 0xBFA43FAD,
+ 0x9DE42C3A, 0x920D5078, 0xCC9B6A5F, 0x4662547E, 0x13C2F68D, 0xB8E890D8, 0xF75E2E39, 0xAFF582C3,
+ 0x80BE9F5D, 0x937C69D0, 0x2DA96FD5, 0x12B3CF25, 0x993BC8AC, 0x7DA71018, 0x636EE89C, 0xBB7BDB3B,
+ 0x7809CD26, 0x18F46E59, 0xB701EC9A, 0x9AA8834F, 0x6E65E695, 0xE67EAAFF, 0xCF0821BC, 0xE8E6EF15,
+ 0x9BD9BAE7, 0x36CE4A6F, 0x09D4EA9F, 0x7CD629B0, 0xB2AF31A4, 0x23312A3F, 0x9430C6A5, 0x66C035A2,
+ 0xBC37744E, 0xCAA6FC82, 0xD0B0E090, 0xD81533A7, 0x984AF104, 0xDAF741EC, 0x500E7FCD, 0xF62F1791,
+ 0xD68D764D, 0xB04D43EF, 0x4D54CCAA, 0x04DFE496, 0xB5E39ED1, 0x881B4C6A, 0x1FB8C12C, 0x517F4665,
+ 0xEA049D5E, 0x355D018C, 0x7473FA87, 0x412EFB0B, 0x1D5AB367, 0xD25292DB, 0x5633E910, 0x47136DD6,
+ 0x618C9AD7, 0x0C7A37A1, 0x148E59F8, 0x3C89EB13, 0x27EECEA9, 0xC935B761, 0xE5EDE11C, 0xB13C7A47,
+ 0xDF599CD2, 0x733F55F2, 0xCE791814, 0x37BF73C7, 0xCDEA53F7, 0xAA5B5FFD, 0x6F14DF3D, 0xDB867844,
+ 0xF381CAAF, 0xC43EB968, 0x342C3824, 0x405FC2A3, 0xC372161D, 0x250CBCE2, 0x498B283C, 0x9541FF0D,
+ 0x017139A8, 0xB3DE080C, 0xE49CD8B4, 0xC1906456, 0x84617BCB, 0xB670D532, 0x5C74486C, 0x5742D0B8
+ );
/**
- * Is the mode one that is paddable?
+ * Precomputed invMixColumns table
*
- * @see Crypt_Rijndael::Crypt_Rijndael()
- * @var Boolean
+ * @see Crypt_Rijndael:_encryptBlock()
+ * @see Crypt_Rijndael:_decryptBlock()
+ * @var Array
* @access private
*/
- var $paddable = false;
+ var $dt3 = array(
+ 0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B,
+ 0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5,
+ 0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B,
+ 0x8F5FE703, 0x929C9515, 0x6D7AEBBF, 0x5259DA95, 0xBE832DD4, 0x7421D358, 0xE0692949, 0xC9C8448E,
+ 0xC2896A75, 0x8E7978F4, 0x583E6B99, 0xB971DD27, 0xE14FB6BE, 0x88AD17F0, 0x20AC66C9, 0xCE3AB47D,
+ 0xDF4A1863, 0x1A3182E5, 0x51336097, 0x537F4562, 0x6477E0B1, 0x6BAE84BB, 0x81A01CFE, 0x082B94F9,
+ 0x48685870, 0x45FD198F, 0xDE6C8794, 0x7BF8B752, 0x73D323AB, 0x4B02E272, 0x1F8F57E3, 0x55AB2A66,
+ 0xEB2807B2, 0xB5C2032F, 0xC57B9A86, 0x3708A5D3, 0x2887F230, 0xBFA5B223, 0x036ABA02, 0x16825CED,
+ 0xCF1C2B8A, 0x79B492A7, 0x07F2F0F3, 0x69E2A14E, 0xDAF4CD65, 0x05BED506, 0x34621FD1, 0xA6FE8AC4,
+ 0x2E539D34, 0xF355A0A2, 0x8AE13205, 0xF6EB75A4, 0x83EC390B, 0x60EFAA40, 0x719F065E, 0x6E1051BD,
+ 0x218AF93E, 0xDD063D96, 0x3E05AEDD, 0xE6BD464D, 0x548DB591, 0xC45D0571, 0x06D46F04, 0x5015FF60,
+ 0x98FB2419, 0xBDE997D6, 0x4043CC89, 0xD99E7767, 0xE842BDB0, 0x898B8807, 0x195B38E7, 0xC8EEDB79,
+ 0x7C0A47A1, 0x420FE97C, 0x841EC9F8, 0x00000000, 0x80868309, 0x2BED4832, 0x1170AC1E, 0x5A724E6C,
+ 0x0EFFFBFD, 0x8538560F, 0xAED51E3D, 0x2D392736, 0x0FD9640A, 0x5CA62168, 0x5B54D19B, 0x362E3A24,
+ 0x0A67B10C, 0x57E70F93, 0xEE96D2B4, 0x9B919E1B, 0xC0C54F80, 0xDC20A261, 0x774B695A, 0x121A161C,
+ 0x93BA0AE2, 0xA02AE5C0, 0x22E0433C, 0x1B171D12, 0x090D0B0E, 0x8BC7ADF2, 0xB6A8B92D, 0x1EA9C814,
+ 0xF1198557, 0x75074CAF, 0x99DDBBEE, 0x7F60FDA3, 0x01269FF7, 0x72F5BC5C, 0x663BC544, 0xFB7E345B,
+ 0x4329768B, 0x23C6DCCB, 0xEDFC68B6, 0xE4F163B8, 0x31DCCAD7, 0x63851042, 0x97224013, 0xC6112084,
+ 0x4A247D85, 0xBB3DF8D2, 0xF93211AE, 0x29A16DC7, 0x9E2F4B1D, 0xB230F3DC, 0x8652EC0D, 0xC1E3D077,
+ 0xB3166C2B, 0x70B999A9, 0x9448FA11, 0xE9642247, 0xFC8CC4A8, 0xF03F1AA0, 0x7D2CD856, 0x3390EF22,
+ 0x494EC787, 0x38D1C1D9, 0xCAA2FE8C, 0xD40B3698, 0xF581CFA6, 0x7ADE28A5, 0xB78E26DA, 0xADBFA43F,
+ 0x3A9DE42C, 0x78920D50, 0x5FCC9B6A, 0x7E466254, 0x8D13C2F6, 0xD8B8E890, 0x39F75E2E, 0xC3AFF582,
+ 0x5D80BE9F, 0xD0937C69, 0xD52DA96F, 0x2512B3CF, 0xAC993BC8, 0x187DA710, 0x9C636EE8, 0x3BBB7BDB,
+ 0x267809CD, 0x5918F46E, 0x9AB701EC, 0x4F9AA883, 0x956E65E6, 0xFFE67EAA, 0xBCCF0821, 0x15E8E6EF,
+ 0xE79BD9BA, 0x6F36CE4A, 0x9F09D4EA, 0xB07CD629, 0xA4B2AF31, 0x3F23312A, 0xA59430C6, 0xA266C035,
+ 0x4EBC3774, 0x82CAA6FC, 0x90D0B0E0, 0xA7D81533, 0x04984AF1, 0xECDAF741, 0xCD500E7F, 0x91F62F17,
+ 0x4DD68D76, 0xEFB04D43, 0xAA4D54CC, 0x9604DFE4, 0xD1B5E39E, 0x6A881B4C, 0x2C1FB8C1, 0x65517F46,
+ 0x5EEA049D, 0x8C355D01, 0x877473FA, 0x0B412EFB, 0x671D5AB3, 0xDBD25292, 0x105633E9, 0xD647136D,
+ 0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A,
+ 0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678,
+ 0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF,
+ 0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
+ );
/**
- * Encryption buffer for CTR, OFB and CFB modes
+ * The SubByte S-Box
*
- * @see Crypt_Rijndael::encrypt()
- * @var String
+ * @see Crypt_Rijndael::_encryptBlock()
+ * @var Array
* @access private
*/
- var $enbuffer = array('encrypted' => '', 'xor' => '');
+ var $sbox = array(
+ 0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
+ 0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
+ 0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
+ 0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
+ 0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
+ 0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
+ 0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
+ 0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
+ 0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
+ 0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
+ 0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
+ 0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
+ 0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
+ 0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
+ 0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
+ 0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
+ );
/**
- * Decryption buffer for CTR, OFB and CFB modes
+ * The inverse SubByte S-Box
*
- * @see Crypt_Rijndael::decrypt()
- * @var String
+ * @see Crypt_Rijndael::_decryptBlock()
+ * @var Array
* @access private
*/
- var $debuffer = array('ciphertext' => '');
-
- /**
- * Default Constructor.
- *
- * Determines whether or not the mcrypt extension should be used. $mode should only, at present, be
- * CRYPT_RIJNDAEL_MODE_ECB or CRYPT_RIJNDAEL_MODE_CBC. If not explictly set, CRYPT_RIJNDAEL_MODE_CBC will be used.
- *
- * @param optional Integer $mode
- * @return Crypt_Rijndael
- * @access public
- */
- function __construct($mode = CRYPT_RIJNDAEL_MODE_CBC)
- {
- switch ($mode) {
- case CRYPT_RIJNDAEL_MODE_ECB:
- case CRYPT_RIJNDAEL_MODE_CBC:
- $this->paddable = true;
- $this->mode = $mode;
- break;
- case CRYPT_RIJNDAEL_MODE_CTR:
- case CRYPT_RIJNDAEL_MODE_CFB:
- case CRYPT_RIJNDAEL_MODE_OFB:
- $this->mode = $mode;
- break;
- default:
- $this->paddable = true;
- $this->mode = CRYPT_RIJNDAEL_MODE_CBC;
- }
-
- $t3 = &$this->t3;
- $t2 = &$this->t2;
- $t1 = &$this->t1;
- $t0 = &$this->t0;
-
- $dt3 = &$this->dt3;
- $dt2 = &$this->dt2;
- $dt1 = &$this->dt1;
- $dt0 = &$this->dt0;
-
- // according to (section 5.2.1),
- // precomputed tables can be used in the mixColumns phase. in that example, they're assigned t0...t3, so
- // those are the names we'll use.
- $t3 = array(
- 0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491,
- 0x30305060, 0x01010302, 0x6767A9CE, 0x2B2B7D56, 0xFEFE19E7, 0xD7D762B5, 0xABABE64D, 0x76769AEC,
- 0xCACA458F, 0x82829D1F, 0xC9C94089, 0x7D7D87FA, 0xFAFA15EF, 0x5959EBB2, 0x4747C98E, 0xF0F00BFB,
- 0xADADEC41, 0xD4D467B3, 0xA2A2FD5F, 0xAFAFEA45, 0x9C9CBF23, 0xA4A4F753, 0x727296E4, 0xC0C05B9B,
- 0xB7B7C275, 0xFDFD1CE1, 0x9393AE3D, 0x26266A4C, 0x36365A6C, 0x3F3F417E, 0xF7F702F5, 0xCCCC4F83,
- 0x34345C68, 0xA5A5F451, 0xE5E534D1, 0xF1F108F9, 0x717193E2, 0xD8D873AB, 0x31315362, 0x15153F2A,
- 0x04040C08, 0xC7C75295, 0x23236546, 0xC3C35E9D, 0x18182830, 0x9696A137, 0x05050F0A, 0x9A9AB52F,
- 0x0707090E, 0x12123624, 0x80809B1B, 0xE2E23DDF, 0xEBEB26CD, 0x2727694E, 0xB2B2CD7F, 0x75759FEA,
- 0x09091B12, 0x83839E1D, 0x2C2C7458, 0x1A1A2E34, 0x1B1B2D36, 0x6E6EB2DC, 0x5A5AEEB4, 0xA0A0FB5B,
- 0x5252F6A4, 0x3B3B4D76, 0xD6D661B7, 0xB3B3CE7D, 0x29297B52, 0xE3E33EDD, 0x2F2F715E, 0x84849713,
- 0x5353F5A6, 0xD1D168B9, 0x00000000, 0xEDED2CC1, 0x20206040, 0xFCFC1FE3, 0xB1B1C879, 0x5B5BEDB6,
- 0x6A6ABED4, 0xCBCB468D, 0xBEBED967, 0x39394B72, 0x4A4ADE94, 0x4C4CD498, 0x5858E8B0, 0xCFCF4A85,
- 0xD0D06BBB, 0xEFEF2AC5, 0xAAAAE54F, 0xFBFB16ED, 0x4343C586, 0x4D4DD79A, 0x33335566, 0x85859411,
- 0x4545CF8A, 0xF9F910E9, 0x02020604, 0x7F7F81FE, 0x5050F0A0, 0x3C3C4478, 0x9F9FBA25, 0xA8A8E34B,
- 0x5151F3A2, 0xA3A3FE5D, 0x4040C080, 0x8F8F8A05, 0x9292AD3F, 0x9D9DBC21, 0x38384870, 0xF5F504F1,
- 0xBCBCDF63, 0xB6B6C177, 0xDADA75AF, 0x21216342, 0x10103020, 0xFFFF1AE5, 0xF3F30EFD, 0xD2D26DBF,
- 0xCDCD4C81, 0x0C0C1418, 0x13133526, 0xECEC2FC3, 0x5F5FE1BE, 0x9797A235, 0x4444CC88, 0x1717392E,
- 0xC4C45793, 0xA7A7F255, 0x7E7E82FC, 0x3D3D477A, 0x6464ACC8, 0x5D5DE7BA, 0x19192B32, 0x737395E6,
- 0x6060A0C0, 0x81819819, 0x4F4FD19E, 0xDCDC7FA3, 0x22226644, 0x2A2A7E54, 0x9090AB3B, 0x8888830B,
- 0x4646CA8C, 0xEEEE29C7, 0xB8B8D36B, 0x14143C28, 0xDEDE79A7, 0x5E5EE2BC, 0x0B0B1D16, 0xDBDB76AD,
- 0xE0E03BDB, 0x32325664, 0x3A3A4E74, 0x0A0A1E14, 0x4949DB92, 0x06060A0C, 0x24246C48, 0x5C5CE4B8,
- 0xC2C25D9F, 0xD3D36EBD, 0xACACEF43, 0x6262A6C4, 0x9191A839, 0x9595A431, 0xE4E437D3, 0x79798BF2,
- 0xE7E732D5, 0xC8C8438B, 0x3737596E, 0x6D6DB7DA, 0x8D8D8C01, 0xD5D564B1, 0x4E4ED29C, 0xA9A9E049,
- 0x6C6CB4D8, 0x5656FAAC, 0xF4F407F3, 0xEAEA25CF, 0x6565AFCA, 0x7A7A8EF4, 0xAEAEE947, 0x08081810,
- 0xBABAD56F, 0x787888F0, 0x25256F4A, 0x2E2E725C, 0x1C1C2438, 0xA6A6F157, 0xB4B4C773, 0xC6C65197,
- 0xE8E823CB, 0xDDDD7CA1, 0x74749CE8, 0x1F1F213E, 0x4B4BDD96, 0xBDBDDC61, 0x8B8B860D, 0x8A8A850F,
- 0x707090E0, 0x3E3E427C, 0xB5B5C471, 0x6666AACC, 0x4848D890, 0x03030506, 0xF6F601F7, 0x0E0E121C,
- 0x6161A3C2, 0x35355F6A, 0x5757F9AE, 0xB9B9D069, 0x86869117, 0xC1C15899, 0x1D1D273A, 0x9E9EB927,
- 0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733,
- 0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5,
- 0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0,
- 0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
- );
-
- $dt3 = array(
- 0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B,
- 0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5,
- 0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B,
- 0x8F5FE703, 0x929C9515, 0x6D7AEBBF, 0x5259DA95, 0xBE832DD4, 0x7421D358, 0xE0692949, 0xC9C8448E,
- 0xC2896A75, 0x8E7978F4, 0x583E6B99, 0xB971DD27, 0xE14FB6BE, 0x88AD17F0, 0x20AC66C9, 0xCE3AB47D,
- 0xDF4A1863, 0x1A3182E5, 0x51336097, 0x537F4562, 0x6477E0B1, 0x6BAE84BB, 0x81A01CFE, 0x082B94F9,
- 0x48685870, 0x45FD198F, 0xDE6C8794, 0x7BF8B752, 0x73D323AB, 0x4B02E272, 0x1F8F57E3, 0x55AB2A66,
- 0xEB2807B2, 0xB5C2032F, 0xC57B9A86, 0x3708A5D3, 0x2887F230, 0xBFA5B223, 0x036ABA02, 0x16825CED,
- 0xCF1C2B8A, 0x79B492A7, 0x07F2F0F3, 0x69E2A14E, 0xDAF4CD65, 0x05BED506, 0x34621FD1, 0xA6FE8AC4,
- 0x2E539D34, 0xF355A0A2, 0x8AE13205, 0xF6EB75A4, 0x83EC390B, 0x60EFAA40, 0x719F065E, 0x6E1051BD,
- 0x218AF93E, 0xDD063D96, 0x3E05AEDD, 0xE6BD464D, 0x548DB591, 0xC45D0571, 0x06D46F04, 0x5015FF60,
- 0x98FB2419, 0xBDE997D6, 0x4043CC89, 0xD99E7767, 0xE842BDB0, 0x898B8807, 0x195B38E7, 0xC8EEDB79,
- 0x7C0A47A1, 0x420FE97C, 0x841EC9F8, 0x00000000, 0x80868309, 0x2BED4832, 0x1170AC1E, 0x5A724E6C,
- 0x0EFFFBFD, 0x8538560F, 0xAED51E3D, 0x2D392736, 0x0FD9640A, 0x5CA62168, 0x5B54D19B, 0x362E3A24,
- 0x0A67B10C, 0x57E70F93, 0xEE96D2B4, 0x9B919E1B, 0xC0C54F80, 0xDC20A261, 0x774B695A, 0x121A161C,
- 0x93BA0AE2, 0xA02AE5C0, 0x22E0433C, 0x1B171D12, 0x090D0B0E, 0x8BC7ADF2, 0xB6A8B92D, 0x1EA9C814,
- 0xF1198557, 0x75074CAF, 0x99DDBBEE, 0x7F60FDA3, 0x01269FF7, 0x72F5BC5C, 0x663BC544, 0xFB7E345B,
- 0x4329768B, 0x23C6DCCB, 0xEDFC68B6, 0xE4F163B8, 0x31DCCAD7, 0x63851042, 0x97224013, 0xC6112084,
- 0x4A247D85, 0xBB3DF8D2, 0xF93211AE, 0x29A16DC7, 0x9E2F4B1D, 0xB230F3DC, 0x8652EC0D, 0xC1E3D077,
- 0xB3166C2B, 0x70B999A9, 0x9448FA11, 0xE9642247, 0xFC8CC4A8, 0xF03F1AA0, 0x7D2CD856, 0x3390EF22,
- 0x494EC787, 0x38D1C1D9, 0xCAA2FE8C, 0xD40B3698, 0xF581CFA6, 0x7ADE28A5, 0xB78E26DA, 0xADBFA43F,
- 0x3A9DE42C, 0x78920D50, 0x5FCC9B6A, 0x7E466254, 0x8D13C2F6, 0xD8B8E890, 0x39F75E2E, 0xC3AFF582,
- 0x5D80BE9F, 0xD0937C69, 0xD52DA96F, 0x2512B3CF, 0xAC993BC8, 0x187DA710, 0x9C636EE8, 0x3BBB7BDB,
- 0x267809CD, 0x5918F46E, 0x9AB701EC, 0x4F9AA883, 0x956E65E6, 0xFFE67EAA, 0xBCCF0821, 0x15E8E6EF,
- 0xE79BD9BA, 0x6F36CE4A, 0x9F09D4EA, 0xB07CD629, 0xA4B2AF31, 0x3F23312A, 0xA59430C6, 0xA266C035,
- 0x4EBC3774, 0x82CAA6FC, 0x90D0B0E0, 0xA7D81533, 0x04984AF1, 0xECDAF741, 0xCD500E7F, 0x91F62F17,
- 0x4DD68D76, 0xEFB04D43, 0xAA4D54CC, 0x9604DFE4, 0xD1B5E39E, 0x6A881B4C, 0x2C1FB8C1, 0x65517F46,
- 0x5EEA049D, 0x8C355D01, 0x877473FA, 0x0B412EFB, 0x671D5AB3, 0xDBD25292, 0x105633E9, 0xD647136D,
- 0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A,
- 0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678,
- 0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF,
- 0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
- );
-
- for ($i = 0; $i < 256; $i++) {
- $t2[$i << 8] = (($t3[$i] << 8) & 0xFFFFFF00) | (($t3[$i] >> 24) & 0x000000FF);
- $t1[$i << 16] = (($t3[$i] << 16) & 0xFFFF0000) | (($t3[$i] >> 16) & 0x0000FFFF);
- $t0[$i << 24] = (($t3[$i] << 24) & 0xFF000000) | (($t3[$i] >> 8) & 0x00FFFFFF);
-
- $dt2[$i << 8] = (($this->dt3[$i] << 8) & 0xFFFFFF00) | (($dt3[$i] >> 24) & 0x000000FF);
- $dt1[$i << 16] = (($this->dt3[$i] << 16) & 0xFFFF0000) | (($dt3[$i] >> 16) & 0x0000FFFF);
- $dt0[$i << 24] = (($this->dt3[$i] << 24) & 0xFF000000) | (($dt3[$i] >> 8) & 0x00FFFFFF);
- }
- }
+ var $isbox = array(
+ 0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
+ 0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
+ 0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
+ 0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
+ 0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
+ 0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
+ 0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
+ 0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
+ 0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
+ 0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
+ 0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
+ 0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
+ 0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
+ 0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
+ 0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
+ 0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
+ );
/**
* Sets the key.
@@ -532,58 +684,82 @@ function __construct($mode = CRYPT_RIJNDAEL_MODE_CBC)
*
* If the key is not explicitly set, it'll be assumed to be all null bytes.
*
+ * Note: 160/224-bit keys must explicitly set by setKeyLength(), otherwise they will be round/pad up to 192/256 bits.
+ *
+ * @see Crypt_Base:setKey()
+ * @see setKeyLength()
* @access public
* @param String $key
*/
function setKey($key)
{
- $this->key = $key;
- $this->changed = true;
- }
+ parent::setKey($key);
- /**
- * Sets the initialization vector. (optional)
- *
- * SetIV is not required when CRYPT_RIJNDAEL_MODE_ECB is being used. If not explictly set, it'll be assumed
- * to be all zero's.
- *
- * @access public
- * @param String $iv
- */
- function setIV($iv)
- {
- $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($iv, 0, $this->block_size), $this->block_size, chr(0));;
+ if (!$this->explicit_key_length) {
+ $length = strlen($key);
+ switch (true) {
+ case $length <= 16:
+ $this->key_size = 16;
+ break;
+ case $length <= 24:
+ $this->key_size = 24;
+ break;
+ default:
+ $this->key_size = 32;
+ }
+ $this->_setupEngine();
+ }
}
/**
* Sets the key length
*
* Valid key lengths are 128, 160, 192, 224, and 256. If the length is less than 128, it will be rounded up to
- * 128. If the length is greater then 128 and invalid, it will be rounded down to the closest valid amount.
+ * 128. If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
+ *
+ * Note: phpseclib extends Rijndael (and AES) for using 160- and 224-bit keys but they are officially not defined
+ * and the most (if not all) implementations are not able using 160/224-bit keys but round/pad them up to
+ * 192/256 bits as, for example, mcrypt will do.
+ *
+ * That said, if you want be compatible with other Rijndael and AES implementations,
+ * you should not setKeyLength(160) or setKeyLength(224).
+ *
+ * Additional: In case of 160- and 224-bit keys, phpseclib will/can, for that reason, not use
+ * the mcrypt php extension, even if available.
+ * This results then in slower encryption.
*
* @access public
* @param Integer $length
*/
function setKeyLength($length)
{
- $length >>= 5;
- if ($length > 8) {
- $length = 8;
- } else if ($length < 4) {
- $length = 4;
+ switch (true) {
+ case $length == 160:
+ $this->key_size = 20;
+ break;
+ case $length == 224:
+ $this->key_size = 28;
+ break;
+ case $length <= 128:
+ $this->key_size = 16;
+ break;
+ case $length <= 192:
+ $this->key_size = 24;
+ break;
+ default:
+ $this->key_size = 32;
}
- $this->Nk = $length;
- $this->key_size = $length << 2;
$this->explicit_key_length = true;
$this->changed = true;
+ $this->_setupEngine();
}
/**
* Sets the block length
*
* Valid block lengths are 128, 160, 192, 224, and 256. If the length is less than 128, it will be rounded up to
- * 128. If the length is greater then 128 and invalid, it will be rounded down to the closest valid amount.
+ * 128. If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
*
* @access public
* @param Integer $length
@@ -599,293 +775,76 @@ function setBlockLength($length)
$this->Nb = $length;
$this->block_size = $length << 2;
$this->changed = true;
+ $this->_setupEngine();
}
/**
- * Generate CTR XOR encryption key
- *
- * Encrypt the output of this and XOR it against the ciphertext / plaintext to get the
- * plaintext / ciphertext in CTR mode.
- *
- * @see Crypt_Rijndael::decrypt()
- * @see Crypt_Rijndael::encrypt()
- * @access public
- * @param Integer $length
- * @param String $iv
- */
- function _generate_xor($length, &$iv)
- {
- $xor = '';
- $block_size = $this->block_size;
- $num_blocks = floor(($length + ($block_size - 1)) / $block_size);
- for ($i = 0; $i < $num_blocks; $i++) {
- $xor.= $iv;
- for ($j = 4; $j <= $block_size; $j+=4) {
- $temp = substr($iv, -$j, 4);
- switch ($temp) {
- case "\xFF\xFF\xFF\xFF":
- $iv = substr_replace($iv, "\x00\x00\x00\x00", -$j, 4);
- break;
- case "\x7F\xFF\xFF\xFF":
- $iv = substr_replace($iv, "\x80\x00\x00\x00", -$j, 4);
- break 2;
- default:
- extract(unpack('Ncount', $temp));
- $iv = substr_replace($iv, pack('N', $count + 1), -$j, 4);
- break 2;
- }
- }
- }
-
- return $xor;
- }
-
- /**
- * Encrypts a message.
- *
- * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size. Other Rjindael
- * implementations may or may not pad in the same manner. Other common approaches to padding and the reasons why it's
- * necessary are discussed in the following
- * URL:
+ * Setup the fastest possible $engine
*
- * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
+ * Determines if the mcrypt (MODE_MCRYPT) $engine available
+ * and usable for the current $block_size and $key_size.
*
- * An alternative to padding is to, separately, send the length of the file. This is what SSH, in fact, does.
- * strlen($plaintext) will still need to be a multiple of 8, however, arbitrary values can be added to make it that
- * length.
+ * If not, the slower MODE_INTERNAL $engine will be set.
*
- * @see Crypt_Rijndael::decrypt()
- * @access public
- * @param String $plaintext
+ * @see setKey()
+ * @see setKeyLength()
+ * @see setBlockLength()
+ * @access private
*/
- function encrypt($plaintext)
+ function _setupEngine()
{
- $this->_setup();
- if ($this->paddable) {
- $plaintext = $this->_pad($plaintext);
+ if (constant('CRYPT_' . $this->const_namespace . '_MODE') == CRYPT_MODE_INTERNAL) {
+ // No mcrypt support at all for rijndael
+ return;
}
- $block_size = $this->block_size;
- $buffer = &$this->enbuffer;
- $continuousBuffer = $this->continuousBuffer;
- $ciphertext = '';
- switch ($this->mode) {
- case CRYPT_RIJNDAEL_MODE_ECB:
- for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
- $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
- }
- break;
- case CRYPT_RIJNDAEL_MODE_CBC:
- $xor = $this->encryptIV;
- for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
- $block = substr($plaintext, $i, $block_size);
- $block = $this->_encryptBlock($block ^ $xor);
- $xor = $block;
- $ciphertext.= $block;
- }
- if ($this->continuousBuffer) {
- $this->encryptIV = $xor;
- }
- break;
- case CRYPT_RIJNDAEL_MODE_CTR:
- $xor = $this->encryptIV;
- if (!empty($buffer)) {
- for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
- $block = substr($plaintext, $i, $block_size);
- $buffer.= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
- $key = $this->_string_shift($buffer, $block_size);
- $ciphertext.= $block ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
- $block = substr($plaintext, $i, $block_size);
- $key = $this->_encryptBlock($this->_generate_xor($block_size, $xor));
- $ciphertext.= $block ^ $key;
- }
- }
- if ($this->continuousBuffer) {
- $this->encryptIV = $xor;
- if ($start = strlen($plaintext) % $block_size) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
- break;
- case CRYPT_RIJNDAEL_MODE_CFB:
- if (!empty($buffer['xor'])) {
- $ciphertext = $plaintext ^ $buffer['xor'];
- $iv = $buffer['encrypted'] . $ciphertext;
- $start = strlen($ciphertext);
- $buffer['encrypted'].= $ciphertext;
- $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
- } else {
- $ciphertext = '';
- $iv = $this->encryptIV;
- $start = 0;
- }
-
- for ($i = $start; $i < strlen($plaintext); $i+=$block_size) {
- $block = substr($plaintext, $i, $block_size);
- $xor = $this->_encryptBlock($iv);
- $iv = $block ^ $xor;
- if ($continuousBuffer && strlen($iv) != $block_size) {
- $buffer = array(
- 'encrypted' => $iv,
- 'xor' => substr($xor, strlen($iv))
- );
- }
- $ciphertext.= $iv;
- }
+ // The required mcrypt module name for the current $block_size of rijndael
+ $cipher_name_mcrypt = 'rijndael-' . ($this->block_size << 3);
- if ($this->continuousBuffer) {
- $this->encryptIV = $iv;
- }
+ // Determining the availibility/usability of $cipher_name_mcrypt
+ switch (true) {
+ case $this->key_size % 8: // mcrypt is not usable for 160/224-bit keys, only for 128/192/256-bit keys
+ case !in_array($cipher_name_mcrypt, mcrypt_list_algorithms()): // $cipher_name_mcrypt is not available for the current $block_size
+ $engine = CRYPT_MODE_INTERNAL;
break;
- case CRYPT_RIJNDAEL_MODE_OFB:
- $xor = $this->encryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
- $xor = $this->_encryptBlock($xor);
- $buffer.= $xor;
- $key = $this->_string_shift($buffer, $block_size);
- $ciphertext.= substr($plaintext, $i, $block_size) ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
- $xor = $this->_encryptBlock($xor);
- $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
- }
- $key = $xor;
- }
- if ($this->continuousBuffer) {
- $this->encryptIV = $xor;
- if ($start = strlen($plaintext) % $block_size) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
+ default:
+ $engine = CRYPT_MODE_MCRYPT;
}
- return $ciphertext;
+ if ($this->engine == $engine && $this->cipher_name_mcrypt == $cipher_name_mcrypt) {
+ // allready set, so we not unnecessary close $this->enmcrypt/demcrypt/ecb
+ return;
+ }
+
+ // Set the $engine
+ $this->engine = $engine;
+ $this->cipher_name_mcrypt = $cipher_name_mcrypt;
+
+ if ($this->enmcrypt) {
+ // Closing the current mcrypt resource(s). _mcryptSetup() will, if needed,
+ // (re)open them with the module named in $this->cipher_name_mcrypt
+ mcrypt_module_close($this->enmcrypt);
+ mcrypt_module_close($this->demcrypt);
+ $this->enmcrypt = null;
+ $this->demcrypt = null;
+
+ if ($this->ecb) {
+ mcrypt_module_close($this->ecb);
+ $this->ecb = null;
+ }
+ }
}
/**
- * Decrypts a message.
+ * Setup the CRYPT_MODE_MCRYPT $engine
*
- * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
- * it is.
- *
- * @see Crypt_Rijndael::encrypt()
- * @access public
- * @param String $ciphertext
+ * @see Crypt_Base::_setupMcrypt()
+ * @access private
*/
- function decrypt($ciphertext)
+ function _setupMcrypt()
{
- $this->_setup();
-
- if ($this->paddable) {
- // we pad with chr(0) since that's what mcrypt_generic does. to quote from http://php.net/function.mcrypt-generic :
- // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
- $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($this->block_size - strlen($ciphertext) % $this->block_size) % $this->block_size, chr(0));
- }
-
- $block_size = $this->block_size;
- $buffer = &$this->debuffer;
- $continuousBuffer = $this->continuousBuffer;
- $plaintext = '';
- switch ($this->mode) {
- case CRYPT_RIJNDAEL_MODE_ECB:
- for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
- $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
- }
- break;
- case CRYPT_RIJNDAEL_MODE_CBC:
- $xor = $this->decryptIV;
- for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
- $block = substr($ciphertext, $i, $block_size);
- $plaintext.= $this->_decryptBlock($block) ^ $xor;
- $xor = $block;
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $xor;
- }
- break;
- case CRYPT_RIJNDAEL_MODE_CTR:
- $xor = $this->decryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
- $block = substr($ciphertext, $i, $block_size);
- $buffer.= $this->_encryptBlock($this->_generate_xor($block_size, $xor));
- $key = $this->_string_shift($buffer, $block_size);
- $plaintext.= $block ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
- $block = substr($ciphertext, $i, $block_size);
- $key = $this->_encryptBlock($this->_generate_xor($block_size, $xor));
- $plaintext.= $block ^ $key;
- }
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $xor;
- if ($start = strlen($ciphertext) % $block_size) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
- break;
- case CRYPT_RIJNDAEL_MODE_CFB:
- if (!empty($buffer['ciphertext'])) {
- $plaintext = $ciphertext ^ substr($this->decryptIV, strlen($buffer['ciphertext']));
- $buffer['ciphertext'].= substr($ciphertext, 0, strlen($plaintext));
- if (strlen($buffer['ciphertext']) == $block_size) {
- $xor = $this->_encryptBlock($buffer['ciphertext']);
- $buffer['ciphertext'] = '';
- }
- $start = strlen($plaintext);
- $block = $this->decryptIV;
- } else {
- $plaintext = '';
- $xor = $this->_encryptBlock($this->decryptIV);
- $start = 0;
- }
-
- for ($i = $start; $i < strlen($ciphertext); $i+=$block_size) {
- $block = substr($ciphertext, $i, $block_size);
- $plaintext.= $block ^ $xor;
- if ($continuousBuffer && strlen($block) != $block_size) {
- $buffer['ciphertext'].= $block;
- $block = $xor;
- } else if (strlen($block) == $block_size) {
- $xor = $this->_encryptBlock($block);
- }
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $block;
- }
- break;
- case CRYPT_RIJNDAEL_MODE_OFB:
- $xor = $this->decryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
- $xor = $this->_encryptBlock($xor);
- $buffer.= $xor;
- $key = $this->_string_shift($buffer, $block_size);
- $plaintext.= substr($ciphertext, $i, $block_size) ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
- $xor = $this->_encryptBlock($xor);
- $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
- }
- $key = $xor;
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $xor;
- if ($start = strlen($ciphertext) % $block_size) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
- }
-
- return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+ $this->key = str_pad(substr($this->key, 0, $this->key_size), $this->key_size, "\0");
+ parent::_setupMcrypt();
}
/**
@@ -897,22 +856,29 @@ function decrypt($ciphertext)
*/
function _encryptBlock($in)
{
+ static $t0, $t1, $t2, $t3, $sbox;
+ if (!$t0) {
+ for ($i = 0; $i < 256; ++$i) {
+ $t0[] = (int)$this->t0[$i];
+ $t1[] = (int)$this->t1[$i];
+ $t2[] = (int)$this->t2[$i];
+ $t3[] = (int)$this->t3[$i];
+ $sbox[] = (int)$this->sbox[$i];
+ }
+ }
+
$state = array();
- $words = unpack('N*word', $in);
+ $words = unpack('N*', $in);
+ $c = $this->c;
$w = $this->w;
- $t0 = $this->t0;
- $t1 = $this->t1;
- $t2 = $this->t2;
- $t3 = $this->t3;
$Nb = $this->Nb;
$Nr = $this->Nr;
- $c = $this->c;
// addRoundKey
- $i = 0;
+ $i = -1;
foreach ($words as $word) {
- $state[] = $word ^ $w[0][$i++];
+ $state[] = $word ^ $w[0][++$i];
}
// fips-197.pdf#page=19, "Figure 5. Pseudo Code for the Cipher", states that this loop has four components -
@@ -924,32 +890,32 @@ function _encryptBlock($in)
// [1] http://fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.v316.pdf
$temp = array();
- for ($round = 1; $round < $Nr; $round++) {
+ for ($round = 1; $round < $Nr; ++$round) {
$i = 0; // $c[0] == 0
$j = $c[1];
$k = $c[2];
$l = $c[3];
- while ($i < $this->Nb) {
- $temp[$i] = $t0[$state[$i] & 0xFF000000] ^
- $t1[$state[$j] & 0x00FF0000] ^
- $t2[$state[$k] & 0x0000FF00] ^
- $t3[$state[$l] & 0x000000FF] ^
+ while ($i < $Nb) {
+ $temp[$i] = $t0[$state[$i] >> 24 & 0x000000FF] ^
+ $t1[$state[$j] >> 16 & 0x000000FF] ^
+ $t2[$state[$k] >> 8 & 0x000000FF] ^
+ $t3[$state[$l] & 0x000000FF] ^
$w[$round][$i];
- $i++;
+ ++$i;
$j = ($j + 1) % $Nb;
$k = ($k + 1) % $Nb;
$l = ($l + 1) % $Nb;
}
-
- for ($i = 0; $i < $Nb; $i++) {
- $state[$i] = $temp[$i];
- }
+ $state = $temp;
}
// subWord
- for ($i = 0; $i < $Nb; $i++) {
- $state[$i] = $this->_subWord($state[$i]);
+ for ($i = 0; $i < $Nb; ++$i) {
+ $state[$i] = $sbox[$state[$i] & 0x000000FF] |
+ ($sbox[$state[$i] >> 8 & 0x000000FF] << 8) |
+ ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) |
+ ($sbox[$state[$i] >> 24 & 0x000000FF] << 24);
}
// shiftRows + addRoundKey
@@ -957,22 +923,30 @@ function _encryptBlock($in)
$j = $c[1];
$k = $c[2];
$l = $c[3];
- while ($i < $this->Nb) {
+ while ($i < $Nb) {
$temp[$i] = ($state[$i] & 0xFF000000) ^
($state[$j] & 0x00FF0000) ^
($state[$k] & 0x0000FF00) ^
($state[$l] & 0x000000FF) ^
$w[$Nr][$i];
- $i++;
+ ++$i;
$j = ($j + 1) % $Nb;
$k = ($k + 1) % $Nb;
$l = ($l + 1) % $Nb;
}
- $state = $temp;
- array_unshift($state, 'N*');
-
- return call_user_func_array('pack', $state);
+ switch ($Nb) {
+ case 8:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
+ case 7:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
+ case 6:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
+ case 5:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
+ default:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
+ }
}
/**
@@ -984,47 +958,50 @@ function _encryptBlock($in)
*/
function _decryptBlock($in)
{
+ static $dt0, $dt1, $dt2, $dt3, $isbox;
+ if (!$dt0) {
+ for ($i = 0; $i < 256; ++$i) {
+ $dt0[] = (int)$this->dt0[$i];
+ $dt1[] = (int)$this->dt1[$i];
+ $dt2[] = (int)$this->dt2[$i];
+ $dt3[] = (int)$this->dt3[$i];
+ $isbox[] = (int)$this->isbox[$i];
+ }
+ }
+
$state = array();
- $words = unpack('N*word', $in);
+ $words = unpack('N*', $in);
- $num_states = count($state);
+ $c = $this->c;
$dw = $this->dw;
- $dt0 = $this->dt0;
- $dt1 = $this->dt1;
- $dt2 = $this->dt2;
- $dt3 = $this->dt3;
$Nb = $this->Nb;
$Nr = $this->Nr;
- $c = $this->c;
// addRoundKey
- $i = 0;
+ $i = -1;
foreach ($words as $word) {
- $state[] = $word ^ $dw[$Nr][$i++];
+ $state[] = $word ^ $dw[$Nr][++$i];
}
$temp = array();
- for ($round = $Nr - 1; $round > 0; $round--) {
+ for ($round = $Nr - 1; $round > 0; --$round) {
$i = 0; // $c[0] == 0
$j = $Nb - $c[1];
$k = $Nb - $c[2];
$l = $Nb - $c[3];
while ($i < $Nb) {
- $temp[$i] = $dt0[$state[$i] & 0xFF000000] ^
- $dt1[$state[$j] & 0x00FF0000] ^
- $dt2[$state[$k] & 0x0000FF00] ^
- $dt3[$state[$l] & 0x000000FF] ^
+ $temp[$i] = $dt0[$state[$i] >> 24 & 0x000000FF] ^
+ $dt1[$state[$j] >> 16 & 0x000000FF] ^
+ $dt2[$state[$k] >> 8 & 0x000000FF] ^
+ $dt3[$state[$l] & 0x000000FF] ^
$dw[$round][$i];
- $i++;
+ ++$i;
$j = ($j + 1) % $Nb;
$k = ($k + 1) % $Nb;
$l = ($l + 1) % $Nb;
}
-
- for ($i = 0; $i < $Nb; $i++) {
- $state[$i] = $temp[$i];
- }
+ $state = $temp;
}
// invShiftRows + invSubWord + addRoundKey
@@ -1034,33 +1011,42 @@ function _decryptBlock($in)
$l = $Nb - $c[3];
while ($i < $Nb) {
- $temp[$i] = $dw[0][$i] ^
- $this->_invSubWord(($state[$i] & 0xFF000000) |
- ($state[$j] & 0x00FF0000) |
- ($state[$k] & 0x0000FF00) |
- ($state[$l] & 0x000000FF));
- $i++;
+ $word = ($state[$i] & 0xFF000000) |
+ ($state[$j] & 0x00FF0000) |
+ ($state[$k] & 0x0000FF00) |
+ ($state[$l] & 0x000000FF);
+
+ $temp[$i] = $dw[0][$i] ^ ($isbox[$word & 0x000000FF] |
+ ($isbox[$word >> 8 & 0x000000FF] << 8) |
+ ($isbox[$word >> 16 & 0x000000FF] << 16) |
+ ($isbox[$word >> 24 & 0x000000FF] << 24));
+ ++$i;
$j = ($j + 1) % $Nb;
$k = ($k + 1) % $Nb;
$l = ($l + 1) % $Nb;
}
- $state = $temp;
-
- array_unshift($state, 'N*');
-
- return call_user_func_array('pack', $state);
+ switch ($Nb) {
+ case 8:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
+ case 7:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
+ case 6:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
+ case 5:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
+ default:
+ return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
+ }
}
/**
- * Setup Rijndael
- *
- * Validates all the variables and calculates $Nr - the number of rounds that need to be performed - and $w - the key
- * key schedule.
+ * Setup the key (expansion)
*
+ * @see Crypt_Base::_setupKey()
* @access private
*/
- function _setup()
+ function _setupKey()
{
// Each number in $rcon is equal to the previous number multiplied by two in Rijndael's finite field.
// See http://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplicative_inverse
@@ -1073,25 +1059,15 @@ function _setup()
0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
);
- if (!$this->changed) {
- return;
- }
+ $this->key = str_pad(substr($this->key, 0, $this->key_size), $this->key_size, "\0");
- if (!$this->explicit_key_length) {
- // we do >> 2, here, and not >> 5, as we do above, since strlen($this->key) tells us the number of bytes - not bits
- $length = strlen($this->key) >> 2;
- if ($length > 8) {
- $length = 8;
- } else if ($length < 4) {
- $length = 4;
- }
- $this->Nk = $length;
- $this->key_size = $length << 2;
+ if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->key_size === $this->kl['key_size'] && $this->block_size === $this->kl['block_size']) {
+ // already expanded
+ return;
}
+ $this->kl = array('key' => $this->key, 'key_size' => $this->key_size, 'block_size' => $this->block_size);
- $this->key = str_pad(substr($this->key, 0, $this->key_size), $this->key_size, chr(0));
- $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($this->iv, 0, $this->block_size), $this->block_size, chr(0));
-
+ $this->Nk = $this->key_size >> 2;
// see Rijndael-ammended.pdf#page=44
$this->Nr = max($this->Nk, $this->Nb) + 6;
@@ -1112,9 +1088,7 @@ function _setup()
$this->c = array(0, 1, 3, 4);
}
- $key = $this->key;
-
- $w = array_values(unpack('N*words', $key));
+ $w = array_values(unpack('N*words', $this->key));
$length = $this->Nb * ($this->Nr + 1);
for ($i = $this->Nk; $i < $length; $i++) {
@@ -1139,7 +1113,7 @@ function _setup()
// 1. Apply the Key Expansion.
// 2. Apply InvMixColumn to all Round Keys except the first and the last one."
// also, see fips-197.pdf#page=27, "5.3.5 Equivalent Inverse Cipher"
- $temp = array();
+ $temp = $this->w = $this->dw = array();
for ($i = $row = $col = 0; $i < $length; $i++, $col++) {
if ($col == $this->Nb) {
if ($row == 0) {
@@ -1149,10 +1123,10 @@ function _setup()
$j = 0;
while ($j < $this->Nb) {
$dw = $this->_subWord($this->w[$row][$j]);
- $temp[$j] = $this->dt0[$dw & 0xFF000000] ^
- $this->dt1[$dw & 0x00FF0000] ^
- $this->dt2[$dw & 0x0000FF00] ^
- $this->dt3[$dw & 0x000000FF];
+ $temp[$j] = $this->dt0[$dw >> 24 & 0x000000FF] ^
+ $this->dt1[$dw >> 16 & 0x000000FF] ^
+ $this->dt2[$dw >> 8 & 0x000000FF] ^
+ $this->dt3[$dw & 0x000000FF];
$j++;
}
$this->dw[$row] = $temp;
@@ -1166,261 +1140,202 @@ function _setup()
$this->dw[$row] = $this->w[$row];
- $this->changed = false;
+ // In case of $this->use_inline_crypt === true we have to use 1-dim key arrays (both ascending)
+ if ($this->use_inline_crypt) {
+ $this->dw = array_reverse($this->dw);
+ $w = array_pop($this->w);
+ $dw = array_pop($this->dw);
+ foreach ($this->w as $r => $wr) {
+ foreach ($wr as $c => $wc) {
+ $w[] = $wc;
+ $dw[] = $this->dw[$r][$c];
+ }
+ }
+ $this->w = $w;
+ $this->dw = $dw;
+ }
}
/**
* Performs S-Box substitutions
*
* @access private
+ * @param Integer $word
*/
function _subWord($word)
{
- static $sbox0, $sbox1, $sbox2, $sbox3;
-
- if (empty($sbox0)) {
- $sbox0 = array(
- 0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
- 0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
- 0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
- 0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
- 0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
- 0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
- 0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
- 0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
- 0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
- 0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
- 0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
- 0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
- 0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
- 0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
- 0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
- 0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
- );
-
- $sbox1 = array();
- $sbox2 = array();
- $sbox3 = array();
-
- for ($i = 0; $i < 256; $i++) {
- $sbox1[$i << 8] = $sbox0[$i] << 8;
- $sbox2[$i << 16] = $sbox0[$i] << 16;
- $sbox3[$i << 24] = $sbox0[$i] << 24;
- }
- }
+ $sbox = $this->sbox;
- return $sbox0[$word & 0x000000FF] |
- $sbox1[$word & 0x0000FF00] |
- $sbox2[$word & 0x00FF0000] |
- $sbox3[$word & 0xFF000000];
+ return $sbox[$word & 0x000000FF] |
+ ($sbox[$word >> 8 & 0x000000FF] << 8) |
+ ($sbox[$word >> 16 & 0x000000FF] << 16) |
+ ($sbox[$word >> 24 & 0x000000FF] << 24);
}
/**
- * Performs inverse S-Box substitutions
+ * Setup the performance-optimized function for de/encrypt()
*
+ * @see Crypt_Base::_setupInlineCrypt()
* @access private
*/
- function _invSubWord($word)
+ function _setupInlineCrypt()
{
- static $sbox0, $sbox1, $sbox2, $sbox3;
-
- if (empty($sbox0)) {
- $sbox0 = array(
- 0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
- 0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
- 0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
- 0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
- 0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
- 0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
- 0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
- 0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
- 0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
- 0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
- 0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
- 0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
- 0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
- 0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
- 0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
- 0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
- );
-
- $sbox1 = array();
- $sbox2 = array();
- $sbox3 = array();
-
- for ($i = 0; $i < 256; $i++) {
- $sbox1[$i << 8] = $sbox0[$i] << 8;
- $sbox2[$i << 16] = $sbox0[$i] << 16;
- $sbox3[$i << 24] = $sbox0[$i] << 24;
+ // Note: _setupInlineCrypt() will be called only if $this->changed === true
+ // So here we are'nt under the same heavy timing-stress as we are in _de/encryptBlock() or de/encrypt().
+ // However...the here generated function- $code, stored as php callback in $this->inline_crypt, must work as fast as even possible.
+
+ $lambda_functions =& Crypt_Rijndael::_getLambdaFunctions();
+
+ // The first 10 generated $lambda_functions will use the key-words hardcoded for better performance.
+ // For memory reason we limit those ultra-optimized functions.
+ // After that, we use pure (extracted) integer vars for the key-words which is faster than accessing them via array.
+ if (count($lambda_functions) < 10) {
+ $w = $this->w;
+ $dw = $this->dw;
+ $init_encrypt = '';
+ $init_decrypt = '';
+ } else {
+ for ($i = 0, $cw = count($this->w); $i < $cw; ++$i) {
+ $w[] = '$w[' . $i . ']';
+ $dw[] = '$dw[' . $i . ']';
}
+ $init_encrypt = '$w = $self->w;';
+ $init_decrypt = '$dw = $self->dw;';
}
- return $sbox0[$word & 0x000000FF] |
- $sbox1[$word & 0x0000FF00] |
- $sbox2[$word & 0x00FF0000] |
- $sbox3[$word & 0xFF000000];
- }
+ $code_hash = md5(str_pad("Crypt_Rijndael, {$this->mode}, {$this->block_size}, ", 32, "\0") . implode(',', $w));
+
+ if (!isset($lambda_functions[$code_hash])) {
+ $Nr = $this->Nr;
+ $Nb = $this->Nb;
+ $c = $this->c;
+
+ // Generating encrypt code:
+ $init_encrypt.= '
+ static $t0, $t1, $t2, $t3, $sbox;
+ if (!$t0) {
+ for ($i = 0; $i < 256; ++$i) {
+ $t0[$i] = (int)$self->t0[$i];
+ $t1[$i] = (int)$self->t1[$i];
+ $t2[$i] = (int)$self->t2[$i];
+ $t3[$i] = (int)$self->t3[$i];
+ $sbox[$i] = (int)$self->sbox[$i];
+ }
+ }
+ ';
- /**
- * Pad "packets".
- *
- * Rijndael works by encrypting between sixteen and thirty-two bytes at a time, provided that number is also a multiple
- * of four. If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
- * pad the input so that it is of the proper length.
- *
- * Padding is enabled by default. Sometimes, however, it is undesirable to pad strings. Such is the case in SSH,
- * where "packets" are padded with random bytes before being encrypted. Unpad these packets and you risk stripping
- * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
- * transmitted separately)
- *
- * @see Crypt_Rijndael::disablePadding()
- * @access public
- */
- function enablePadding()
- {
- $this->padding = true;
- }
+ $s = 'e';
+ $e = 's';
+ $wc = $Nb - 1;
- /**
- * Do not pad packets.
- *
- * @see Crypt_Rijndael::enablePadding()
- * @access public
- */
- function disablePadding()
- {
- $this->padding = false;
- }
+ // Preround: addRoundKey
+ $encrypt_block = '$in = unpack("N*", $in);'."\n";
+ for ($i = 0; $i < $Nb; ++$i) {
+ $encrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$w[++$wc].";\n";
+ }
- /**
- * Pads a string
- *
- * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
- * $block_size - (strlen($text) % $block_size) bytes are added, each of which is equal to
- * chr($block_size - (strlen($text) % $block_size)
- *
- * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
- * and padding will, hence forth, be enabled.
- *
- * @see Crypt_Rijndael::_unpad()
- * @access private
- */
- function _pad($text)
- {
- $length = strlen($text);
-
- if (!$this->padding) {
- if ($length % $this->block_size == 0) {
- return $text;
- } else {
- user_error("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size})", E_USER_NOTICE);
- $this->padding = true;
+ // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
+ for ($round = 1; $round < $Nr; ++$round) {
+ list($s, $e) = array($e, $s);
+ for ($i = 0; $i < $Nb; ++$i) {
+ $encrypt_block.=
+ '$'.$e.$i.' =
+ $t0[($'.$s.$i .' >> 24) & 0xff] ^
+ $t1[($'.$s.(($i + $c[1]) % $Nb).' >> 16) & 0xff] ^
+ $t2[($'.$s.(($i + $c[2]) % $Nb).' >> 8) & 0xff] ^
+ $t3[ $'.$s.(($i + $c[3]) % $Nb).' & 0xff] ^
+ '.$w[++$wc].";\n";
+ }
}
- }
- $pad = $this->block_size - ($length % $this->block_size);
+ // Finalround: subWord + shiftRows + addRoundKey
+ for ($i = 0; $i < $Nb; ++$i) {
+ $encrypt_block.=
+ '$'.$e.$i.' =
+ $sbox[ $'.$e.$i.' & 0xff] |
+ ($sbox[($'.$e.$i.' >> 8) & 0xff] << 8) |
+ ($sbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
+ ($sbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
+ }
+ $encrypt_block .= '$in = pack("N*"'."\n";
+ for ($i = 0; $i < $Nb; ++$i) {
+ $encrypt_block.= ',
+ ($'.$e.$i .' & 0xFF000000) ^
+ ($'.$e.(($i + $c[1]) % $Nb).' & 0x00FF0000) ^
+ ($'.$e.(($i + $c[2]) % $Nb).' & 0x0000FF00) ^
+ ($'.$e.(($i + $c[3]) % $Nb).' & 0x000000FF) ^
+ '.$w[$i]."\n";
+ }
+ $encrypt_block .= ');';
+
+ // Generating decrypt code:
+ $init_decrypt.= '
+ static $dt0, $dt1, $dt2, $dt3, $isbox;
+ if (!$dt0) {
+ for ($i = 0; $i < 256; ++$i) {
+ $dt0[$i] = (int)$self->dt0[$i];
+ $dt1[$i] = (int)$self->dt1[$i];
+ $dt2[$i] = (int)$self->dt2[$i];
+ $dt3[$i] = (int)$self->dt3[$i];
+ $isbox[$i] = (int)$self->isbox[$i];
+ }
+ }
+ ';
- return str_pad($text, $length + $pad, chr($pad));
- }
+ $s = 'e';
+ $e = 's';
+ $wc = $Nb - 1;
- /**
- * Unpads a string.
- *
- * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
- * and false will be returned.
- *
- * @see Crypt_Rijndael::_pad()
- * @access private
- */
- function _unpad($text)
- {
- if (!$this->padding) {
- return $text;
- }
+ // Preround: addRoundKey
+ $decrypt_block = '$in = unpack("N*", $in);'."\n";
+ for ($i = 0; $i < $Nb; ++$i) {
+ $decrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$dw[++$wc].';'."\n";
+ }
- $length = ord($text[strlen($text) - 1]);
+ // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
+ for ($round = 1; $round < $Nr; ++$round) {
+ list($s, $e) = array($e, $s);
+ for ($i = 0; $i < $Nb; ++$i) {
+ $decrypt_block.=
+ '$'.$e.$i.' =
+ $dt0[($'.$s.$i .' >> 24) & 0xff] ^
+ $dt1[($'.$s.(($Nb + $i - $c[1]) % $Nb).' >> 16) & 0xff] ^
+ $dt2[($'.$s.(($Nb + $i - $c[2]) % $Nb).' >> 8) & 0xff] ^
+ $dt3[ $'.$s.(($Nb + $i - $c[3]) % $Nb).' & 0xff] ^
+ '.$dw[++$wc].";\n";
+ }
+ }
- if (!$length || $length > $this->block_size) {
- return false;
+ // Finalround: subWord + shiftRows + addRoundKey
+ for ($i = 0; $i < $Nb; ++$i) {
+ $decrypt_block.=
+ '$'.$e.$i.' =
+ $isbox[ $'.$e.$i.' & 0xff] |
+ ($isbox[($'.$e.$i.' >> 8) & 0xff] << 8) |
+ ($isbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
+ ($isbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
+ }
+ $decrypt_block .= '$in = pack("N*"'."\n";
+ for ($i = 0; $i < $Nb; ++$i) {
+ $decrypt_block.= ',
+ ($'.$e.$i. ' & 0xFF000000) ^
+ ($'.$e.(($Nb + $i - $c[1]) % $Nb).' & 0x00FF0000) ^
+ ($'.$e.(($Nb + $i - $c[2]) % $Nb).' & 0x0000FF00) ^
+ ($'.$e.(($Nb + $i - $c[3]) % $Nb).' & 0x000000FF) ^
+ '.$dw[$i]."\n";
+ }
+ $decrypt_block .= ');';
+
+ $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+ array(
+ 'init_crypt' => '',
+ 'init_encrypt' => $init_encrypt,
+ 'init_decrypt' => $init_decrypt,
+ 'encrypt_block' => $encrypt_block,
+ 'decrypt_block' => $decrypt_block
+ )
+ );
}
-
- return substr($text, 0, -$length);
- }
-
- /**
- * Treat consecutive "packets" as if they are a continuous buffer.
- *
- * Say you have a 32-byte plaintext $plaintext. Using the default behavior, the two following code snippets
- * will yield different outputs:
- *
- *
- * echo $rijndael->encrypt(substr($plaintext, 0, 16));
- * echo $rijndael->encrypt(substr($plaintext, 16, 16));
- *
- *
- * echo $rijndael->encrypt($plaintext);
- *
- *
- * The solution is to enable the continuous buffer. Although this will resolve the above discrepancy, it creates
- * another, as demonstrated with the following:
- *
- *
- * $rijndael->encrypt(substr($plaintext, 0, 16));
- * echo $rijndael->decrypt($des->encrypt(substr($plaintext, 16, 16)));
- *
- *
- * echo $rijndael->decrypt($des->encrypt(substr($plaintext, 16, 16)));
- *
- *
- * With the continuous buffer disabled, these would yield the same output. With it enabled, they yield different
- * outputs. The reason is due to the fact that the initialization vector's change after every encryption /
- * decryption round when the continuous buffer is enabled. When it's disabled, they remain constant.
- *
- * Put another way, when the continuous buffer is enabled, the state of the Crypt_Rijndael() object changes after each
- * encryption / decryption round, whereas otherwise, it'd remain constant. For this reason, it's recommended that
- * continuous buffers not be used. They do offer better security and are, in fact, sometimes required (SSH uses them),
- * however, they are also less intuitive and more likely to cause you problems.
- *
- * @see Crypt_Rijndael::disableContinuousBuffer()
- * @access public
- */
- function enableContinuousBuffer()
- {
- $this->continuousBuffer = true;
- }
-
- /**
- * Treat consecutive packets as if they are a discontinuous buffer.
- *
- * The default behavior.
- *
- * @see Crypt_Rijndael::enableContinuousBuffer()
- * @access public
- */
- function disableContinuousBuffer()
- {
- $this->continuousBuffer = false;
- $this->encryptIV = $this->iv;
- $this->decryptIV = $this->iv;
- }
-
- /**
- * String Shift
- *
- * Inspired by array_shift
- *
- * @param String $string
- * @param optional Integer $index
- * @return String
- * @access private
- */
- function _string_shift(&$string, $index = 1)
- {
- $substr = substr($string, 0, $index);
- $string = substr($string, $index);
- return $substr;
+ $this->inline_crypt = $lambda_functions[$code_hash];
}
}
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/vendor/phpseclib/Crypt/TripleDES.php b/vendor/phpseclib/Crypt/TripleDES.php
index a3230a222f..adbba9d34b 100644
--- a/vendor/phpseclib/Crypt/TripleDES.php
+++ b/vendor/phpseclib/Crypt/TripleDES.php
@@ -13,7 +13,7 @@
* Here's a short example of how to use this library:
*
*
- * @copyright MMVII Jim Wigginton
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
- * @version $Id: TripleDES.php,v 1.13 2010/02/26 03:40:25 terrafrost Exp $
- * @link http://phpseclib.sourceforge.net
+ * @category Crypt
+ * @package Crypt_TripleDES
+ * @author Jim Wigginton
+ * @copyright MMVII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
*/
/**
@@ -73,255 +72,160 @@
/**
* Pure-PHP implementation of Triple DES.
*
+ * @package Crypt_TripleDES
* @author Jim Wigginton
- * @version 0.1.0
* @access public
- * @package Crypt_TerraDES
*/
-class Crypt_TripleDES {
+class Crypt_TripleDES extends Crypt_DES
+{
/**
- * The Three Keys
+ * The default password key_size used by setPassword()
*
- * @see Crypt_TripleDES::setKey()
- * @var String
+ * @see Crypt_DES::password_key_size
+ * @see Crypt_Base::password_key_size
+ * @see Crypt_Base::setPassword()
+ * @var Integer
* @access private
*/
- var $key = "\0\0\0\0\0\0\0\0";
+ var $password_key_size = 24;
/**
- * The Encryption Mode
+ * The default salt used by setPassword()
*
- * @see Crypt_TripleDES::Crypt_TripleDES()
- * @var Integer
+ * @see Crypt_Base::password_default_salt
+ * @see Crypt_Base::setPassword()
+ * @var String
* @access private
*/
- var $mode = CRYPT_DES_MODE_CBC;
+ var $password_default_salt = 'phpseclib';
/**
- * Continuous Buffer status
+ * The namespace used by the cipher for its constants.
*
- * @see Crypt_TripleDES::enableContinuousBuffer()
- * @var Boolean
+ * @see Crypt_DES::const_namespace
+ * @see Crypt_Base::const_namespace
+ * @var String
* @access private
*/
- var $continuousBuffer = false;
+ var $const_namespace = 'DES';
/**
- * Padding status
+ * The mcrypt specific name of the cipher
*
- * @see Crypt_TripleDES::enablePadding()
- * @var Boolean
+ * @see Crypt_DES::cipher_name_mcrypt
+ * @see Crypt_Base::cipher_name_mcrypt
+ * @var String
* @access private
*/
- var $padding = true;
+ var $cipher_name_mcrypt = 'tripledes';
/**
- * The Initialization Vector
+ * Optimizing value while CFB-encrypting
*
- * @see Crypt_TripleDES::setIV()
- * @var String
+ * @see Crypt_Base::cfb_init_len
+ * @var Integer
* @access private
*/
- var $iv = "\0\0\0\0\0\0\0\0";
+ var $cfb_init_len = 750;
/**
- * A "sliding" Initialization Vector
+ * max possible size of $key
*
- * @see Crypt_TripleDES::enableContinuousBuffer()
+ * @see Crypt_TripleDES::setKey()
+ * @see Crypt_DES::setKey()
* @var String
* @access private
*/
- var $encryptIV = "\0\0\0\0\0\0\0\0";
+ var $key_size_max = 24;
/**
- * A "sliding" Initialization Vector
+ * Internal flag whether using CRYPT_DES_MODE_3CBC or not
*
- * @see Crypt_TripleDES::enableContinuousBuffer()
- * @var String
+ * @var Boolean
* @access private
*/
- var $decryptIV = "\0\0\0\0\0\0\0\0";
+ var $mode_3cbc;
/**
* The Crypt_DES objects
*
+ * Used only if $mode_3cbc === true
+ *
* @var Array
* @access private
*/
var $des;
/**
- * mcrypt resource for encryption
+ * Default Constructor.
*
- * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
- * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+ * Determines whether or not the mcrypt extension should be used.
*
- * @see Crypt_TripleDES::encrypt()
- * @var String
- * @access private
- */
- var $enmcrypt;
-
- /**
- * mcrypt resource for decryption
+ * $mode could be:
*
- * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
- * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+ * - CRYPT_DES_MODE_ECB
*
- * @see Crypt_TripleDES::decrypt()
- * @var String
- * @access private
- */
- var $demcrypt;
-
- /**
- * Does the enmcrypt resource need to be (re)initialized?
+ * - CRYPT_DES_MODE_CBC
*
- * @see Crypt_TripleDES::setKey()
- * @see Crypt_TripleDES::setIV()
- * @var Boolean
- * @access private
- */
- var $enchanged = true;
-
- /**
- * Does the demcrypt resource need to be (re)initialized?
- *
- * @see Crypt_TripleDES::setKey()
- * @see Crypt_TripleDES::setIV()
- * @var Boolean
- * @access private
- */
- var $dechanged = true;
-
- /**
- * Is the mode one that is paddable?
- *
- * @see Crypt_TripleDES::Crypt_TripleDES()
- * @var Boolean
- * @access private
- */
- var $paddable = false;
-
- /**
- * Encryption buffer for CTR, OFB and CFB modes
+ * - CRYPT_DES_MODE_CTR
*
- * @see Crypt_TripleDES::encrypt()
- * @var String
- * @access private
- */
- var $enbuffer = '';
-
- /**
- * Decryption buffer for CTR, OFB and CFB modes
+ * - CRYPT_DES_MODE_CFB
*
- * @see Crypt_TripleDES::decrypt()
- * @var String
- * @access private
- */
- var $debuffer = '';
-
- /**
- * mcrypt resource for CFB mode
+ * - CRYPT_DES_MODE_OFB
*
- * @see Crypt_TripleDES::encrypt()
- * @see Crypt_TripleDES::decrypt()
- * @var String
- * @access private
- */
- var $ecb;
-
- /**
- * Default Constructor.
+ * - CRYPT_DES_MODE_3CBC
*
- * Determines whether or not the mcrypt extension should be used. $mode should only, at present, be
- * CRYPT_DES_MODE_ECB or CRYPT_DES_MODE_CBC. If not explictly set, CRYPT_DES_MODE_CBC will be used.
+ * If not explicitly set, CRYPT_DES_MODE_CBC will be used.
*
+ * @see Crypt_DES::__construct()
+ * @see Crypt_Base::__construct()
* @param optional Integer $mode
- * @return Crypt_TripleDES
* @access public
*/
function __construct($mode = CRYPT_DES_MODE_CBC)
{
- if ( !defined('CRYPT_DES_MODE') ) {
- switch (true) {
- case extension_loaded('mcrypt'):
- // i'd check to see if des was supported, by doing in_array('des', mcrypt_list_algorithms('')),
- // but since that can be changed after the object has been created, there doesn't seem to be
- // a lot of point...
- define('CRYPT_DES_MODE', CRYPT_DES_MODE_MCRYPT);
- break;
- default:
- define('CRYPT_DES_MODE', CRYPT_DES_MODE_INTERNAL);
- }
- }
-
- if ( $mode == CRYPT_DES_MODE_3CBC ) {
- $this->mode = CRYPT_DES_MODE_3CBC;
- $this->des = array(
- new Crypt_DES(CRYPT_DES_MODE_CBC),
- new Crypt_DES(CRYPT_DES_MODE_CBC),
- new Crypt_DES(CRYPT_DES_MODE_CBC)
- );
-
- // we're going to be doing the padding, ourselves, so disable it in the Crypt_DES objects
- $this->des[0]->disablePadding();
- $this->des[1]->disablePadding();
- $this->des[2]->disablePadding();
-
- return;
- }
-
- switch ( CRYPT_DES_MODE ) {
- case CRYPT_DES_MODE_MCRYPT:
- switch ($mode) {
- case CRYPT_DES_MODE_ECB:
- $this->paddable = true;
- $this->mode = MCRYPT_MODE_ECB;
- break;
- case CRYPT_DES_MODE_CTR:
- $this->mode = 'ctr';
- break;
- case CRYPT_DES_MODE_CFB:
- $this->mode = 'ncfb';
- break;
- case CRYPT_DES_MODE_OFB:
- $this->mode = MCRYPT_MODE_NOFB;
- break;
- case CRYPT_DES_MODE_CBC:
- default:
- $this->paddable = true;
- $this->mode = MCRYPT_MODE_CBC;
- }
-
- break;
- default:
+ switch ($mode) {
+ // In case of CRYPT_DES_MODE_3CBC, we init as CRYPT_DES_MODE_CBC
+ // and additional flag us internally as 3CBC
+ case CRYPT_DES_MODE_3CBC:
+ parent::__construct(CRYPT_DES_MODE_CBC);
+ $this->mode_3cbc = true;
+
+ // This three $des'es will do the 3CBC work (if $key > 64bits)
$this->des = array(
- new Crypt_DES(CRYPT_DES_MODE_ECB),
- new Crypt_DES(CRYPT_DES_MODE_ECB),
- new Crypt_DES(CRYPT_DES_MODE_ECB)
+ new Crypt_DES(CRYPT_DES_MODE_CBC),
+ new Crypt_DES(CRYPT_DES_MODE_CBC),
+ new Crypt_DES(CRYPT_DES_MODE_CBC),
);
// we're going to be doing the padding, ourselves, so disable it in the Crypt_DES objects
$this->des[0]->disablePadding();
$this->des[1]->disablePadding();
$this->des[2]->disablePadding();
+ break;
+ // If not 3CBC, we init as usual
+ default:
+ parent::__construct($mode);
+ }
+ }
- switch ($mode) {
- case CRYPT_DES_MODE_ECB:
- case CRYPT_DES_MODE_CBC:
- $this->paddable = true;
- $this->mode = $mode;
- break;
- case CRYPT_DES_MODE_CTR:
- case CRYPT_DES_MODE_CFB:
- case CRYPT_DES_MODE_OFB:
- $this->mode = $mode;
- break;
- default:
- $this->paddable = true;
- $this->mode = CRYPT_DES_MODE_CBC;
- }
+ /**
+ * Sets the initialization vector. (optional)
+ *
+ * SetIV is not required when CRYPT_DES_MODE_ECB is being used. If not explicitly set, it'll be assumed
+ * to be all zero's.
+ *
+ * @see Crypt_Base::setIV()
+ * @access public
+ * @param String $iv
+ */
+ function setIV($iv)
+ {
+ parent::setIV($iv);
+ if ($this->mode_3cbc) {
+ $this->des[0]->setIV($iv);
+ $this->des[1]->setIV($iv);
+ $this->des[2]->setIV($iv);
}
}
@@ -333,504 +237,87 @@ function __construct($mode = CRYPT_DES_MODE_CBC)
*
* DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
*
- * If the key is not explicitly set, it'll be assumed to be all zero's.
+ * If the key is not explicitly set, it'll be assumed to be all null bytes.
*
* @access public
+ * @see Crypt_DES::setKey()
+ * @see Crypt_Base::setKey()
* @param String $key
*/
function setKey($key)
{
$length = strlen($key);
if ($length > 8) {
- $key = str_pad($key, 24, chr(0));
+ $key = str_pad(substr($key, 0, 24), 24, chr(0));
// if $key is between 64 and 128-bits, use the first 64-bits as the last, per this:
// http://php.net/function.mcrypt-encrypt#47973
//$key = $length <= 16 ? substr_replace($key, substr($key, 0, 8), 16) : substr($key, 0, 24);
} else {
$key = str_pad($key, 8, chr(0));
}
- $this->key = $key;
- switch (true) {
- case CRYPT_DES_MODE == CRYPT_DES_MODE_INTERNAL:
- case $this->mode == CRYPT_DES_MODE_3CBC:
- $this->des[0]->setKey(substr($key, 0, 8));
- $this->des[1]->setKey(substr($key, 8, 8));
- $this->des[2]->setKey(substr($key, 16, 8));
- }
- $this->enchanged = $this->dechanged = true;
- }
-
- /**
- * Sets the initialization vector. (optional)
- *
- * SetIV is not required when CRYPT_DES_MODE_ECB is being used. If not explictly set, it'll be assumed
- * to be all zero's.
- *
- * @access public
- * @param String $iv
- */
- function setIV($iv)
- {
- $this->encryptIV = $this->decryptIV = $this->iv = str_pad(substr($iv, 0, 8), 8, chr(0));
- if ($this->mode == CRYPT_DES_MODE_3CBC) {
- $this->des[0]->setIV($iv);
- $this->des[1]->setIV($iv);
- $this->des[2]->setIV($iv);
- }
- $this->enchanged = $this->dechanged = true;
- }
-
- /**
- * Generate CTR XOR encryption key
- *
- * Encrypt the output of this and XOR it against the ciphertext / plaintext to get the
- * plaintext / ciphertext in CTR mode.
- *
- * @see Crypt_TripleDES::decrypt()
- * @see Crypt_TripleDES::encrypt()
- * @access private
- * @param Integer $length
- * @param String $iv
- */
- function _generate_xor($length, &$iv)
- {
- $xor = '';
- $num_blocks = ($length + 7) >> 3;
- for ($i = 0; $i < $num_blocks; $i++) {
- $xor.= $iv;
- for ($j = 4; $j <= 8; $j+=4) {
- $temp = substr($iv, -$j, 4);
- switch ($temp) {
- case "\xFF\xFF\xFF\xFF":
- $iv = substr_replace($iv, "\x00\x00\x00\x00", -$j, 4);
- break;
- case "\x7F\xFF\xFF\xFF":
- $iv = substr_replace($iv, "\x80\x00\x00\x00", -$j, 4);
- break 2;
- default:
- extract(unpack('Ncount', $temp));
- $iv = substr_replace($iv, pack('N', $count + 1), -$j, 4);
- break 2;
- }
- }
+ parent::setKey($key);
+
+ // And in case of CRYPT_DES_MODE_3CBC:
+ // if key <= 64bits we not need the 3 $des to work,
+ // because we will then act as regular DES-CBC with just a <= 64bit key.
+ // So only if the key > 64bits (> 8 bytes) we will call setKey() for the 3 $des.
+ if ($this->mode_3cbc && $length > 8) {
+ $this->des[0]->setKey(substr($key, 0, 8));
+ $this->des[1]->setKey(substr($key, 8, 8));
+ $this->des[2]->setKey(substr($key, 16, 8));
}
-
- return $xor;
}
/**
* Encrypts a message.
*
+ * @see Crypt_Base::encrypt()
* @access public
* @param String $plaintext
+ * @return String $cipertext
*/
function encrypt($plaintext)
{
- if ($this->paddable) {
- $plaintext = $this->_pad($plaintext);
- }
+ // parent::en/decrypt() is able to do all the work for all modes and keylengths,
+ // except for: CRYPT_DES_MODE_3CBC (inner chaining CBC) with a key > 64bits
// if the key is smaller then 8, do what we'd normally do
- if ($this->mode == CRYPT_DES_MODE_3CBC && strlen($this->key) > 8) {
- $ciphertext = $this->des[2]->encrypt($this->des[1]->decrypt($this->des[0]->encrypt($plaintext)));
-
- return $ciphertext;
- }
-
- if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
- if ($this->enchanged) {
- if (!isset($this->enmcrypt)) {
- $this->enmcrypt = mcrypt_module_open(MCRYPT_3DES, '', $this->mode, '');
- }
- mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
- if ($this->mode != 'ncfb') {
- $this->enchanged = false;
- }
- }
-
- if ($this->mode != 'ncfb') {
- $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
- } else {
- if ($this->enchanged) {
- $this->ecb = mcrypt_module_open(MCRYPT_3DES, '', MCRYPT_MODE_ECB, '');
- mcrypt_generic_init($this->ecb, $this->key, "\0\0\0\0\0\0\0\0");
- $this->enchanged = false;
- }
-
- if (strlen($this->enbuffer)) {
- $ciphertext = $plaintext ^ substr($this->encryptIV, strlen($this->enbuffer));
- $this->enbuffer.= $ciphertext;
- if (strlen($this->enbuffer) == 8) {
- $this->encryptIV = $this->enbuffer;
- $this->enbuffer = '';
- mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
- }
- $plaintext = substr($plaintext, strlen($ciphertext));
- } else {
- $ciphertext = '';
- }
-
- $last_pos = strlen($plaintext) & 0xFFFFFFF8;
- $ciphertext.= $last_pos ? mcrypt_generic($this->enmcrypt, substr($plaintext, 0, $last_pos)) : '';
-
- if (strlen($plaintext) & 0x7) {
- if (strlen($ciphertext)) {
- $this->encryptIV = substr($ciphertext, -8);
- }
- $this->encryptIV = mcrypt_generic($this->ecb, $this->encryptIV);
- $this->enbuffer = substr($plaintext, $last_pos) ^ $this->encryptIV;
- $ciphertext.= $this->enbuffer;
- }
- }
-
- if (!$this->continuousBuffer) {
- mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
- }
-
- return $ciphertext;
- }
-
- if (strlen($this->key) <= 8) {
- $this->des[0]->mode = $this->mode;
-
- return $this->des[0]->encrypt($plaintext);
- }
-
- $des = $this->des;
-
- $buffer = &$this->enbuffer;
- $continuousBuffer = $this->continuousBuffer;
- $ciphertext = '';
- switch ($this->mode) {
- case CRYPT_DES_MODE_ECB:
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $block = substr($plaintext, $i, 8);
- // all of these _processBlock calls could, in theory, be put in a function - say Crypt_TripleDES::_ede_encrypt() or something.
- // only problem with that: it would slow encryption and decryption down. $this->des would have to be called every time that
- // function is called, instead of once for the whole string of text that's being encrypted, which would, in turn, make
- // encryption and decryption take more time, per this:
- //
- // http://blog.libssh2.org/index.php?/archives/21-Compiled-Variables.html
- $block = $des[0]->_processBlock($block, CRYPT_DES_ENCRYPT);
- $block = $des[1]->_processBlock($block, CRYPT_DES_DECRYPT);
- $block = $des[2]->_processBlock($block, CRYPT_DES_ENCRYPT);
- $ciphertext.= $block;
- }
- break;
- case CRYPT_DES_MODE_CBC:
- $xor = $this->encryptIV;
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $block = substr($plaintext, $i, 8) ^ $xor;
- $block = $des[0]->_processBlock($block, CRYPT_DES_ENCRYPT);
- $block = $des[1]->_processBlock($block, CRYPT_DES_DECRYPT);
- $block = $des[2]->_processBlock($block, CRYPT_DES_ENCRYPT);
- $xor = $block;
- $ciphertext.= $block;
- }
- if ($this->continuousBuffer) {
- $this->encryptIV = $xor;
- }
- break;
- case CRYPT_DES_MODE_CTR:
- $xor = $this->encryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $block = substr($plaintext, $i, 8);
- $key = $this->_generate_xor(8, $xor);
- $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
- $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
- $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
- $buffer.= $key;
- $key = $this->_string_shift($buffer, 8);
- $ciphertext.= $block ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $block = substr($plaintext, $i, 8);
- $key = $this->_generate_xor(8, $xor);
- $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
- $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
- $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
- $ciphertext.= $block ^ $key;
- }
- }
- if ($this->continuousBuffer) {
- $this->encryptIV = $xor;
- if ($start = strlen($plaintext) & 7) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
- break;
- case CRYPT_DES_MODE_CFB:
- if (!empty($buffer['xor'])) {
- $ciphertext = $plaintext ^ $buffer['xor'];
- $iv = $buffer['encrypted'] . $ciphertext;
- $start = strlen($ciphertext);
- $buffer['encrypted'].= $ciphertext;
- $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
- } else {
- $ciphertext = '';
- $iv = $this->encryptIV;
- $start = 0;
- }
-
- for ($i = $start; $i < strlen($plaintext); $i+=8) {
- $block = substr($plaintext, $i, 8);
- $iv = $des[0]->_processBlock($iv, CRYPT_DES_ENCRYPT);
- $iv = $des[1]->_processBlock($iv, CRYPT_DES_DECRYPT);
- $xor= $des[2]->_processBlock($iv, CRYPT_DES_ENCRYPT);
-
- $iv = $block ^ $xor;
- if ($continuousBuffer && strlen($iv) != 8) {
- $buffer = array(
- 'encrypted' => $iv,
- 'xor' => substr($xor, strlen($iv))
- );
- }
- $ciphertext.= $iv;
- }
-
- if ($this->continuousBuffer) {
- $this->encryptIV = $iv;
- }
- break;
- case CRYPT_DES_MODE_OFB:
- $xor = $this->encryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $xor = $des[0]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
- $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $buffer.= $xor;
- $key = $this->_string_shift($buffer, 8);
- $ciphertext.= substr($plaintext, $i, 8) ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($plaintext); $i+=8) {
- $xor = $des[0]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
- $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $ciphertext.= substr($plaintext, $i, 8) ^ $xor;
- }
- $key = $xor;
- }
- if ($this->continuousBuffer) {
- $this->encryptIV = $xor;
- if ($start = strlen($plaintext) & 7) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
+ if ($this->mode_3cbc && strlen($this->key) > 8) {
+ return $this->des[2]->encrypt(
+ $this->des[1]->decrypt(
+ $this->des[0]->encrypt(
+ $this->_pad($plaintext)
+ )
+ )
+ );
}
- return $ciphertext;
+ return parent::encrypt($plaintext);
}
/**
* Decrypts a message.
*
+ * @see Crypt_Base::decrypt()
* @access public
* @param String $ciphertext
+ * @return String $plaintext
*/
function decrypt($ciphertext)
{
- if ($this->mode == CRYPT_DES_MODE_3CBC && strlen($this->key) > 8) {
- $plaintext = $this->des[0]->decrypt($this->des[1]->encrypt($this->des[2]->decrypt($ciphertext)));
-
- return $this->_unpad($plaintext);
- }
-
- if ($this->paddable) {
- // we pad with chr(0) since that's what mcrypt_generic does. to quote from http://php.net/function.mcrypt-generic :
- // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
- $ciphertext = str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, chr(0));
- }
-
- if ( CRYPT_DES_MODE == CRYPT_DES_MODE_MCRYPT ) {
- if ($this->dechanged) {
- if (!isset($this->demcrypt)) {
- $this->demcrypt = mcrypt_module_open(MCRYPT_3DES, '', $this->mode, '');
- }
- mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
- if ($this->mode != 'ncfb') {
- $this->dechanged = false;
- }
- }
-
- if ($this->mode != 'ncfb') {
- $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
- } else {
- if ($this->dechanged) {
- $this->ecb = mcrypt_module_open(MCRYPT_3DES, '', MCRYPT_MODE_ECB, '');
- mcrypt_generic_init($this->ecb, $this->key, "\0\0\0\0\0\0\0\0");
- $this->dechanged = false;
- }
-
- if (strlen($this->debuffer)) {
- $plaintext = $ciphertext ^ substr($this->decryptIV, strlen($this->debuffer));
-
- $this->debuffer.= substr($ciphertext, 0, strlen($plaintext));
- if (strlen($this->debuffer) == 8) {
- $this->decryptIV = $this->debuffer;
- $this->debuffer = '';
- mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
- }
- $ciphertext = substr($ciphertext, strlen($plaintext));
- } else {
- $plaintext = '';
- }
-
- $last_pos = strlen($ciphertext) & 0xFFFFFFF8;
- $plaintext.= $last_pos ? mdecrypt_generic($this->demcrypt, substr($ciphertext, 0, $last_pos)) : '';
-
- if (strlen($ciphertext) & 0x7) {
- if (strlen($plaintext)) {
- $this->decryptIV = substr($ciphertext, $last_pos - 8, 8);
- }
- $this->decryptIV = mcrypt_generic($this->ecb, $this->decryptIV);
- $this->debuffer = substr($ciphertext, $last_pos);
- $plaintext.= $this->debuffer ^ $this->decryptIV;
- }
-
- return $plaintext;
- }
-
- if (!$this->continuousBuffer) {
- mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
- }
-
- return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
- }
-
- if (strlen($this->key) <= 8) {
- $this->des[0]->mode = $this->mode;
- $plaintext = $this->des[0]->decrypt($ciphertext);
- return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
- }
-
- $des = $this->des;
-
- $buffer = &$this->enbuffer;
- $continuousBuffer = $this->continuousBuffer;
- $plaintext = '';
- switch ($this->mode) {
- case CRYPT_DES_MODE_ECB:
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $block = substr($ciphertext, $i, 8);
- $block = $des[2]->_processBlock($block, CRYPT_DES_DECRYPT);
- $block = $des[1]->_processBlock($block, CRYPT_DES_ENCRYPT);
- $block = $des[0]->_processBlock($block, CRYPT_DES_DECRYPT);
- $plaintext.= $block;
- }
- break;
- case CRYPT_DES_MODE_CBC:
- $xor = $this->decryptIV;
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $orig = $block = substr($ciphertext, $i, 8);
- $block = $des[2]->_processBlock($block, CRYPT_DES_DECRYPT);
- $block = $des[1]->_processBlock($block, CRYPT_DES_ENCRYPT);
- $block = $des[0]->_processBlock($block, CRYPT_DES_DECRYPT);
- $plaintext.= $block ^ $xor;
- $xor = $orig;
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $xor;
- }
- break;
- case CRYPT_DES_MODE_CTR:
- $xor = $this->decryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $block = substr($ciphertext, $i, 8);
- $key = $this->_generate_xor(8, $xor);
- $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
- $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
- $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
- $buffer.= $key;
- $key = $this->_string_shift($buffer, 8);
- $plaintext.= $block ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $block = substr($ciphertext, $i, 8);
- $key = $this->_generate_xor(8, $xor);
- $key = $des[0]->_processBlock($key, CRYPT_DES_ENCRYPT);
- $key = $des[1]->_processBlock($key, CRYPT_DES_DECRYPT);
- $key = $des[2]->_processBlock($key, CRYPT_DES_ENCRYPT);
- $plaintext.= $block ^ $key;
- }
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $xor;
- if ($start = strlen($plaintext) & 7) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
- break;
- case CRYPT_DES_MODE_CFB:
- if (!empty($buffer['ciphertext'])) {
- $plaintext = $ciphertext ^ substr($this->decryptIV, strlen($buffer['ciphertext']));
- $buffer['ciphertext'].= substr($ciphertext, 0, strlen($plaintext));
- if (strlen($buffer['ciphertext']) == 8) {
- $xor = $des[0]->_processBlock($buffer['ciphertext'], CRYPT_DES_ENCRYPT);
- $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
- $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $buffer['ciphertext'] = '';
- }
- $start = strlen($plaintext);
- $block = $this->decryptIV;
- } else {
- $plaintext = '';
- $xor = $des[0]->_processBlock($this->decryptIV, CRYPT_DES_ENCRYPT);
- $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
- $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $start = 0;
- }
-
- for ($i = $start; $i < strlen($ciphertext); $i+=8) {
- $block = substr($ciphertext, $i, 8);
- $plaintext.= $block ^ $xor;
- if ($continuousBuffer && strlen($block) != 8) {
- $buffer['ciphertext'].= $block;
- $block = $xor;
- } else if (strlen($block) == 8) {
- $xor = $des[0]->_processBlock($block, CRYPT_DES_ENCRYPT);
- $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
- $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- }
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $block;
- }
- break;
- case CRYPT_DES_MODE_OFB:
- $xor = $this->decryptIV;
- if (strlen($buffer)) {
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $xor = $des[0]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
- $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $buffer.= $xor;
- $key = $this->_string_shift($buffer, 8);
- $plaintext.= substr($ciphertext, $i, 8) ^ $key;
- }
- } else {
- for ($i = 0; $i < strlen($ciphertext); $i+=8) {
- $xor = $des[0]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $xor = $des[1]->_processBlock($xor, CRYPT_DES_DECRYPT);
- $xor = $des[2]->_processBlock($xor, CRYPT_DES_ENCRYPT);
- $plaintext.= substr($ciphertext, $i, 8) ^ $xor;
- }
- $key = $xor;
- }
- if ($this->continuousBuffer) {
- $this->decryptIV = $xor;
- if ($start = strlen($ciphertext) & 7) {
- $buffer = substr($key, $start) . $buffer;
- }
- }
+ if ($this->mode_3cbc && strlen($this->key) > 8) {
+ return $this->_unpad(
+ $this->des[0]->decrypt(
+ $this->des[1]->encrypt(
+ $this->des[2]->decrypt(
+ str_pad($ciphertext, (strlen($ciphertext) + 7) & 0xFFFFFFF8, "\0")
+ )
+ )
+ )
+ );
}
- return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+ return parent::decrypt($ciphertext);
}
/**
@@ -867,13 +354,14 @@ function decrypt($ciphertext)
* continuous buffers not be used. They do offer better security and are, in fact, sometimes required (SSH uses them),
* however, they are also less intuitive and more likely to cause you problems.
*
+ * @see Crypt_Base::enableContinuousBuffer()
* @see Crypt_TripleDES::disableContinuousBuffer()
* @access public
*/
function enableContinuousBuffer()
{
- $this->continuousBuffer = true;
- if ($this->mode == CRYPT_DES_MODE_3CBC) {
+ parent::enableContinuousBuffer();
+ if ($this->mode_3cbc) {
$this->des[0]->enableContinuousBuffer();
$this->des[1]->enableContinuousBuffer();
$this->des[2]->enableContinuousBuffer();
@@ -885,16 +373,14 @@ function enableContinuousBuffer()
*
* The default behavior.
*
+ * @see Crypt_Base::disableContinuousBuffer()
* @see Crypt_TripleDES::enableContinuousBuffer()
* @access public
*/
function disableContinuousBuffer()
{
- $this->continuousBuffer = false;
- $this->encryptIV = $this->iv;
- $this->decryptIV = $this->iv;
-
- if ($this->mode == CRYPT_DES_MODE_3CBC) {
+ parent::disableContinuousBuffer();
+ if ($this->mode_3cbc) {
$this->des[0]->disableContinuousBuffer();
$this->des[1]->disableContinuousBuffer();
$this->des[2]->disableContinuousBuffer();
@@ -902,105 +388,37 @@ function disableContinuousBuffer()
}
/**
- * Pad "packets".
- *
- * DES works by encrypting eight bytes at a time. If you ever need to encrypt or decrypt something that's not
- * a multiple of eight, it becomes necessary to pad the input so that it's length is a multiple of eight.
- *
- * Padding is enabled by default. Sometimes, however, it is undesirable to pad strings. Such is the case in SSH1,
- * where "packets" are padded with random bytes before being encrypted. Unpad these packets and you risk stripping
- * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
- * transmitted separately)
+ * Creates the key schedule
*
- * @see Crypt_TripleDES::disablePadding()
- * @access public
- */
- function enablePadding()
- {
- $this->padding = true;
- }
-
- /**
- * Do not pad packets.
- *
- * @see Crypt_TripleDES::enablePadding()
- * @access public
- */
- function disablePadding()
- {
- $this->padding = false;
- }
-
- /**
- * Pads a string
- *
- * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize (8).
- * 8 - (strlen($text) & 7) bytes are added, each of which is equal to chr(8 - (strlen($text) & 7)
- *
- * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
- * and padding will, hence forth, be enabled.
- *
- * @see Crypt_TripleDES::_unpad()
+ * @see Crypt_DES::_setupKey()
+ * @see Crypt_Base::_setupKey()
* @access private
*/
- function _pad($text)
+ function _setupKey()
{
- $length = strlen($text);
-
- if (!$this->padding) {
- if (($length & 7) == 0) {
- return $text;
- } else {
- user_error("The plaintext's length ($length) is not a multiple of the block size (8)", E_USER_NOTICE);
- $this->padding = true;
- }
- }
-
- $pad = 8 - ($length & 7);
- return str_pad($text, $length + $pad, chr($pad));
- }
+ switch (true) {
+ // if $key <= 64bits we configure our internal pure-php cipher engine
+ // to act as regular [1]DES, not as 3DES. mcrypt.so::tripledes does the same.
+ case strlen($this->key) <= 8:
+ $this->des_rounds = 1;
+ break;
- /**
- * Unpads a string
- *
- * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
- * and false will be returned.
- *
- * @see Crypt_TripleDES::_pad()
- * @access private
- */
- function _unpad($text)
- {
- if (!$this->padding) {
- return $text;
- }
+ // otherwise, if $key > 64bits, we configure our engine to work as 3DES.
+ default:
+ $this->des_rounds = 3;
- $length = ord($text[strlen($text) - 1]);
+ // (only) if 3CBC is used we have, of course, to setup the $des[0-2] keys also separately.
+ if ($this->mode_3cbc) {
+ $this->des[0]->_setupKey();
+ $this->des[1]->_setupKey();
+ $this->des[2]->_setupKey();
- if (!$length || $length > 8) {
- return false;
+ // because $des[0-2] will, now, do all the work we can return here
+ // not need unnecessary stress parent::_setupKey() with our, now unused, $key.
+ return;
+ }
}
-
- return substr($text, 0, -$length);
- }
-
- /**
- * String Shift
- *
- * Inspired by array_shift
- *
- * @param String $string
- * @param optional Integer $index
- * @return String
- * @access private
- */
- function _string_shift(&$string, $index = 1)
- {
- $substr = substr($string, 0, $index);
- $string = substr($string, $index);
- return $substr;
+ // setup our key
+ parent::_setupKey();
}
}
-
-// vim: ts=4:sw=4:et:
-// vim6: fdl=1:
diff --git a/vendor/phpseclib/Crypt/Twofish.php b/vendor/phpseclib/Crypt/Twofish.php
new file mode 100644
index 0000000000..55283cb02a
--- /dev/null
+++ b/vendor/phpseclib/Crypt/Twofish.php
@@ -0,0 +1,894 @@
+
+ * setKey('12345678901234567890123456789012');
+ *
+ * $plaintext = str_repeat('a', 1024);
+ *
+ * echo $twofish->decrypt($twofish->encrypt($plaintext));
+ * ?>
+ *
+ *
+ * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @category Crypt
+ * @package Crypt_Twofish
+ * @author Jim Wigginton
+ * @author Hans-Juergen Petrich
+ * @copyright MMVII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
+ */
+
+/**
+ * Make sure we have the base loaded
+ */
+class_exists('PHPSecLib\Crypt_Base');
+
+/**#@+
+ * @access public
+ * @see Crypt_Twofish::encrypt()
+ * @see Crypt_Twofish::decrypt()
+ */
+/**
+ * Encrypt / decrypt using the Counter mode.
+ *
+ * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+ */
+define('CRYPT_TWOFISH_MODE_CTR', CRYPT_MODE_CTR);
+/**
+ * Encrypt / decrypt using the Electronic Code Book mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+ */
+define('CRYPT_TWOFISH_MODE_ECB', CRYPT_MODE_ECB);
+/**
+ * Encrypt / decrypt using the Code Book Chaining mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+ */
+define('CRYPT_TWOFISH_MODE_CBC', CRYPT_MODE_CBC);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+ */
+define('CRYPT_TWOFISH_MODE_CFB', CRYPT_MODE_CFB);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+ */
+define('CRYPT_TWOFISH_MODE_OFB', CRYPT_MODE_OFB);
+/**#@-*/
+
+/**#@+
+ * @access private
+ * @see Crypt_Base::__construct()
+ */
+/**
+ * Toggles the internal implementation
+ */
+define('CRYPT_TWOFISH_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
+/**
+ * Toggles the mcrypt implementation
+ */
+define('CRYPT_TWOFISH_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
+/**#@-*/
+
+/**
+ * Pure-PHP implementation of Twofish.
+ *
+ * @package Crypt_Twofish
+ * @author Jim Wigginton
+ * @author Hans-Juergen Petrich
+ * @access public
+ */
+class Crypt_Twofish extends Crypt_Base
+{
+ /**
+ * The namespace used by the cipher for its constants.
+ *
+ * @see Crypt_Base::const_namespace
+ * @var String
+ * @access private
+ */
+ var $const_namespace = 'TWOFISH';
+
+ /**
+ * The mcrypt specific name of the cipher
+ *
+ * @see Crypt_Base::cipher_name_mcrypt
+ * @var String
+ * @access private
+ */
+ var $cipher_name_mcrypt = 'twofish';
+
+ /**
+ * Optimizing value while CFB-encrypting
+ *
+ * @see Crypt_Base::cfb_init_len
+ * @var Integer
+ * @access private
+ */
+ var $cfb_init_len = 800;
+
+ /**
+ * Q-Table
+ *
+ * @var Array
+ * @access private
+ */
+ var $q0 = array (
+ 0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76,
+ 0x9A, 0x92, 0x80, 0x78, 0xE4, 0xDD, 0xD1, 0x38,
+ 0x0D, 0xC6, 0x35, 0x98, 0x18, 0xF7, 0xEC, 0x6C,
+ 0x43, 0x75, 0x37, 0x26, 0xFA, 0x13, 0x94, 0x48,
+ 0xF2, 0xD0, 0x8B, 0x30, 0x84, 0x54, 0xDF, 0x23,
+ 0x19, 0x5B, 0x3D, 0x59, 0xF3, 0xAE, 0xA2, 0x82,
+ 0x63, 0x01, 0x83, 0x2E, 0xD9, 0x51, 0x9B, 0x7C,
+ 0xA6, 0xEB, 0xA5, 0xBE, 0x16, 0x0C, 0xE3, 0x61,
+ 0xC0, 0x8C, 0x3A, 0xF5, 0x73, 0x2C, 0x25, 0x0B,
+ 0xBB, 0x4E, 0x89, 0x6B, 0x53, 0x6A, 0xB4, 0xF1,
+ 0xE1, 0xE6, 0xBD, 0x45, 0xE2, 0xF4, 0xB6, 0x66,
+ 0xCC, 0x95, 0x03, 0x56, 0xD4, 0x1C, 0x1E, 0xD7,
+ 0xFB, 0xC3, 0x8E, 0xB5, 0xE9, 0xCF, 0xBF, 0xBA,
+ 0xEA, 0x77, 0x39, 0xAF, 0x33, 0xC9, 0x62, 0x71,
+ 0x81, 0x79, 0x09, 0xAD, 0x24, 0xCD, 0xF9, 0xD8,
+ 0xE5, 0xC5, 0xB9, 0x4D, 0x44, 0x08, 0x86, 0xE7,
+ 0xA1, 0x1D, 0xAA, 0xED, 0x06, 0x70, 0xB2, 0xD2,
+ 0x41, 0x7B, 0xA0, 0x11, 0x31, 0xC2, 0x27, 0x90,
+ 0x20, 0xF6, 0x60, 0xFF, 0x96, 0x5C, 0xB1, 0xAB,
+ 0x9E, 0x9C, 0x52, 0x1B, 0x5F, 0x93, 0x0A, 0xEF,
+ 0x91, 0x85, 0x49, 0xEE, 0x2D, 0x4F, 0x8F, 0x3B,
+ 0x47, 0x87, 0x6D, 0x46, 0xD6, 0x3E, 0x69, 0x64,
+ 0x2A, 0xCE, 0xCB, 0x2F, 0xFC, 0x97, 0x05, 0x7A,
+ 0xAC, 0x7F, 0xD5, 0x1A, 0x4B, 0x0E, 0xA7, 0x5A,
+ 0x28, 0x14, 0x3F, 0x29, 0x88, 0x3C, 0x4C, 0x02,
+ 0xB8, 0xDA, 0xB0, 0x17, 0x55, 0x1F, 0x8A, 0x7D,
+ 0x57, 0xC7, 0x8D, 0x74, 0xB7, 0xC4, 0x9F, 0x72,
+ 0x7E, 0x15, 0x22, 0x12, 0x58, 0x07, 0x99, 0x34,
+ 0x6E, 0x50, 0xDE, 0x68, 0x65, 0xBC, 0xDB, 0xF8,
+ 0xC8, 0xA8, 0x2B, 0x40, 0xDC, 0xFE, 0x32, 0xA4,
+ 0xCA, 0x10, 0x21, 0xF0, 0xD3, 0x5D, 0x0F, 0x00,
+ 0x6F, 0x9D, 0x36, 0x42, 0x4A, 0x5E, 0xC1, 0xE0
+ );
+
+ /**
+ * Q-Table
+ *
+ * @var Array
+ * @access private
+ */
+ var $q1 = array (
+ 0x75, 0xF3, 0xC6, 0xF4, 0xDB, 0x7B, 0xFB, 0xC8,
+ 0x4A, 0xD3, 0xE6, 0x6B, 0x45, 0x7D, 0xE8, 0x4B,
+ 0xD6, 0x32, 0xD8, 0xFD, 0x37, 0x71, 0xF1, 0xE1,
+ 0x30, 0x0F, 0xF8, 0x1B, 0x87, 0xFA, 0x06, 0x3F,
+ 0x5E, 0xBA, 0xAE, 0x5B, 0x8A, 0x00, 0xBC, 0x9D,
+ 0x6D, 0xC1, 0xB1, 0x0E, 0x80, 0x5D, 0xD2, 0xD5,
+ 0xA0, 0x84, 0x07, 0x14, 0xB5, 0x90, 0x2C, 0xA3,
+ 0xB2, 0x73, 0x4C, 0x54, 0x92, 0x74, 0x36, 0x51,
+ 0x38, 0xB0, 0xBD, 0x5A, 0xFC, 0x60, 0x62, 0x96,
+ 0x6C, 0x42, 0xF7, 0x10, 0x7C, 0x28, 0x27, 0x8C,
+ 0x13, 0x95, 0x9C, 0xC7, 0x24, 0x46, 0x3B, 0x70,
+ 0xCA, 0xE3, 0x85, 0xCB, 0x11, 0xD0, 0x93, 0xB8,
+ 0xA6, 0x83, 0x20, 0xFF, 0x9F, 0x77, 0xC3, 0xCC,
+ 0x03, 0x6F, 0x08, 0xBF, 0x40, 0xE7, 0x2B, 0xE2,
+ 0x79, 0x0C, 0xAA, 0x82, 0x41, 0x3A, 0xEA, 0xB9,
+ 0xE4, 0x9A, 0xA4, 0x97, 0x7E, 0xDA, 0x7A, 0x17,
+ 0x66, 0x94, 0xA1, 0x1D, 0x3D, 0xF0, 0xDE, 0xB3,
+ 0x0B, 0x72, 0xA7, 0x1C, 0xEF, 0xD1, 0x53, 0x3E,
+ 0x8F, 0x33, 0x26, 0x5F, 0xEC, 0x76, 0x2A, 0x49,
+ 0x81, 0x88, 0xEE, 0x21, 0xC4, 0x1A, 0xEB, 0xD9,
+ 0xC5, 0x39, 0x99, 0xCD, 0xAD, 0x31, 0x8B, 0x01,
+ 0x18, 0x23, 0xDD, 0x1F, 0x4E, 0x2D, 0xF9, 0x48,
+ 0x4F, 0xF2, 0x65, 0x8E, 0x78, 0x5C, 0x58, 0x19,
+ 0x8D, 0xE5, 0x98, 0x57, 0x67, 0x7F, 0x05, 0x64,
+ 0xAF, 0x63, 0xB6, 0xFE, 0xF5, 0xB7, 0x3C, 0xA5,
+ 0xCE, 0xE9, 0x68, 0x44, 0xE0, 0x4D, 0x43, 0x69,
+ 0x29, 0x2E, 0xAC, 0x15, 0x59, 0xA8, 0x0A, 0x9E,
+ 0x6E, 0x47, 0xDF, 0x34, 0x35, 0x6A, 0xCF, 0xDC,
+ 0x22, 0xC9, 0xC0, 0x9B, 0x89, 0xD4, 0xED, 0xAB,
+ 0x12, 0xA2, 0x0D, 0x52, 0xBB, 0x02, 0x2F, 0xA9,
+ 0xD7, 0x61, 0x1E, 0xB4, 0x50, 0x04, 0xF6, 0xC2,
+ 0x16, 0x25, 0x86, 0x56, 0x55, 0x09, 0xBE, 0x91
+ );
+
+ /**
+ * M-Table
+ *
+ * @var Array
+ * @access private
+ */
+ var $m0 = array (
+ 0xBCBC3275, 0xECEC21F3, 0x202043C6, 0xB3B3C9F4, 0xDADA03DB, 0x02028B7B, 0xE2E22BFB, 0x9E9EFAC8,
+ 0xC9C9EC4A, 0xD4D409D3, 0x18186BE6, 0x1E1E9F6B, 0x98980E45, 0xB2B2387D, 0xA6A6D2E8, 0x2626B74B,
+ 0x3C3C57D6, 0x93938A32, 0x8282EED8, 0x525298FD, 0x7B7BD437, 0xBBBB3771, 0x5B5B97F1, 0x474783E1,
+ 0x24243C30, 0x5151E20F, 0xBABAC6F8, 0x4A4AF31B, 0xBFBF4887, 0x0D0D70FA, 0xB0B0B306, 0x7575DE3F,
+ 0xD2D2FD5E, 0x7D7D20BA, 0x666631AE, 0x3A3AA35B, 0x59591C8A, 0x00000000, 0xCDCD93BC, 0x1A1AE09D,
+ 0xAEAE2C6D, 0x7F7FABC1, 0x2B2BC7B1, 0xBEBEB90E, 0xE0E0A080, 0x8A8A105D, 0x3B3B52D2, 0x6464BAD5,
+ 0xD8D888A0, 0xE7E7A584, 0x5F5FE807, 0x1B1B1114, 0x2C2CC2B5, 0xFCFCB490, 0x3131272C, 0x808065A3,
+ 0x73732AB2, 0x0C0C8173, 0x79795F4C, 0x6B6B4154, 0x4B4B0292, 0x53536974, 0x94948F36, 0x83831F51,
+ 0x2A2A3638, 0xC4C49CB0, 0x2222C8BD, 0xD5D5F85A, 0xBDBDC3FC, 0x48487860, 0xFFFFCE62, 0x4C4C0796,
+ 0x4141776C, 0xC7C7E642, 0xEBEB24F7, 0x1C1C1410, 0x5D5D637C, 0x36362228, 0x6767C027, 0xE9E9AF8C,
+ 0x4444F913, 0x1414EA95, 0xF5F5BB9C, 0xCFCF18C7, 0x3F3F2D24, 0xC0C0E346, 0x7272DB3B, 0x54546C70,
+ 0x29294CCA, 0xF0F035E3, 0x0808FE85, 0xC6C617CB, 0xF3F34F11, 0x8C8CE4D0, 0xA4A45993, 0xCACA96B8,
+ 0x68683BA6, 0xB8B84D83, 0x38382820, 0xE5E52EFF, 0xADAD569F, 0x0B0B8477, 0xC8C81DC3, 0x9999FFCC,
+ 0x5858ED03, 0x19199A6F, 0x0E0E0A08, 0x95957EBF, 0x70705040, 0xF7F730E7, 0x6E6ECF2B, 0x1F1F6EE2,
+ 0xB5B53D79, 0x09090F0C, 0x616134AA, 0x57571682, 0x9F9F0B41, 0x9D9D803A, 0x111164EA, 0x2525CDB9,
+ 0xAFAFDDE4, 0x4545089A, 0xDFDF8DA4, 0xA3A35C97, 0xEAEAD57E, 0x353558DA, 0xEDEDD07A, 0x4343FC17,
+ 0xF8F8CB66, 0xFBFBB194, 0x3737D3A1, 0xFAFA401D, 0xC2C2683D, 0xB4B4CCF0, 0x32325DDE, 0x9C9C71B3,
+ 0x5656E70B, 0xE3E3DA72, 0x878760A7, 0x15151B1C, 0xF9F93AEF, 0x6363BFD1, 0x3434A953, 0x9A9A853E,
+ 0xB1B1428F, 0x7C7CD133, 0x88889B26, 0x3D3DA65F, 0xA1A1D7EC, 0xE4E4DF76, 0x8181942A, 0x91910149,
+ 0x0F0FFB81, 0xEEEEAA88, 0x161661EE, 0xD7D77321, 0x9797F5C4, 0xA5A5A81A, 0xFEFE3FEB, 0x6D6DB5D9,
+ 0x7878AEC5, 0xC5C56D39, 0x1D1DE599, 0x7676A4CD, 0x3E3EDCAD, 0xCBCB6731, 0xB6B6478B, 0xEFEF5B01,
+ 0x12121E18, 0x6060C523, 0x6A6AB0DD, 0x4D4DF61F, 0xCECEE94E, 0xDEDE7C2D, 0x55559DF9, 0x7E7E5A48,
+ 0x2121B24F, 0x03037AF2, 0xA0A02665, 0x5E5E198E, 0x5A5A6678, 0x65654B5C, 0x62624E58, 0xFDFD4519,
+ 0x0606F48D, 0x404086E5, 0xF2F2BE98, 0x3333AC57, 0x17179067, 0x05058E7F, 0xE8E85E05, 0x4F4F7D64,
+ 0x89896AAF, 0x10109563, 0x74742FB6, 0x0A0A75FE, 0x5C5C92F5, 0x9B9B74B7, 0x2D2D333C, 0x3030D6A5,
+ 0x2E2E49CE, 0x494989E9, 0x46467268, 0x77775544, 0xA8A8D8E0, 0x9696044D, 0x2828BD43, 0xA9A92969,
+ 0xD9D97929, 0x8686912E, 0xD1D187AC, 0xF4F44A15, 0x8D8D1559, 0xD6D682A8, 0xB9B9BC0A, 0x42420D9E,
+ 0xF6F6C16E, 0x2F2FB847, 0xDDDD06DF, 0x23233934, 0xCCCC6235, 0xF1F1C46A, 0xC1C112CF, 0x8585EBDC,
+ 0x8F8F9E22, 0x7171A1C9, 0x9090F0C0, 0xAAAA539B, 0x0101F189, 0x8B8BE1D4, 0x4E4E8CED, 0x8E8E6FAB,
+ 0xABABA212, 0x6F6F3EA2, 0xE6E6540D, 0xDBDBF252, 0x92927BBB, 0xB7B7B602, 0x6969CA2F, 0x3939D9A9,
+ 0xD3D30CD7, 0xA7A72361, 0xA2A2AD1E, 0xC3C399B4, 0x6C6C4450, 0x07070504, 0x04047FF6, 0x272746C2,
+ 0xACACA716, 0xD0D07625, 0x50501386, 0xDCDCF756, 0x84841A55, 0xE1E15109, 0x7A7A25BE, 0x1313EF91
+ );
+
+ /**
+ * M-Table
+ *
+ * @var Array
+ * @access private
+ */
+ var $m1 = array (
+ 0xA9D93939, 0x67901717, 0xB3719C9C, 0xE8D2A6A6, 0x04050707, 0xFD985252, 0xA3658080, 0x76DFE4E4,
+ 0x9A084545, 0x92024B4B, 0x80A0E0E0, 0x78665A5A, 0xE4DDAFAF, 0xDDB06A6A, 0xD1BF6363, 0x38362A2A,
+ 0x0D54E6E6, 0xC6432020, 0x3562CCCC, 0x98BEF2F2, 0x181E1212, 0xF724EBEB, 0xECD7A1A1, 0x6C774141,
+ 0x43BD2828, 0x7532BCBC, 0x37D47B7B, 0x269B8888, 0xFA700D0D, 0x13F94444, 0x94B1FBFB, 0x485A7E7E,
+ 0xF27A0303, 0xD0E48C8C, 0x8B47B6B6, 0x303C2424, 0x84A5E7E7, 0x54416B6B, 0xDF06DDDD, 0x23C56060,
+ 0x1945FDFD, 0x5BA33A3A, 0x3D68C2C2, 0x59158D8D, 0xF321ECEC, 0xAE316666, 0xA23E6F6F, 0x82165757,
+ 0x63951010, 0x015BEFEF, 0x834DB8B8, 0x2E918686, 0xD9B56D6D, 0x511F8383, 0x9B53AAAA, 0x7C635D5D,
+ 0xA63B6868, 0xEB3FFEFE, 0xA5D63030, 0xBE257A7A, 0x16A7ACAC, 0x0C0F0909, 0xE335F0F0, 0x6123A7A7,
+ 0xC0F09090, 0x8CAFE9E9, 0x3A809D9D, 0xF5925C5C, 0x73810C0C, 0x2C273131, 0x2576D0D0, 0x0BE75656,
+ 0xBB7B9292, 0x4EE9CECE, 0x89F10101, 0x6B9F1E1E, 0x53A93434, 0x6AC4F1F1, 0xB499C3C3, 0xF1975B5B,
+ 0xE1834747, 0xE66B1818, 0xBDC82222, 0x450E9898, 0xE26E1F1F, 0xF4C9B3B3, 0xB62F7474, 0x66CBF8F8,
+ 0xCCFF9999, 0x95EA1414, 0x03ED5858, 0x56F7DCDC, 0xD4E18B8B, 0x1C1B1515, 0x1EADA2A2, 0xD70CD3D3,
+ 0xFB2BE2E2, 0xC31DC8C8, 0x8E195E5E, 0xB5C22C2C, 0xE9894949, 0xCF12C1C1, 0xBF7E9595, 0xBA207D7D,
+ 0xEA641111, 0x77840B0B, 0x396DC5C5, 0xAF6A8989, 0x33D17C7C, 0xC9A17171, 0x62CEFFFF, 0x7137BBBB,
+ 0x81FB0F0F, 0x793DB5B5, 0x0951E1E1, 0xADDC3E3E, 0x242D3F3F, 0xCDA47676, 0xF99D5555, 0xD8EE8282,
+ 0xE5864040, 0xC5AE7878, 0xB9CD2525, 0x4D049696, 0x44557777, 0x080A0E0E, 0x86135050, 0xE730F7F7,
+ 0xA1D33737, 0x1D40FAFA, 0xAA346161, 0xED8C4E4E, 0x06B3B0B0, 0x706C5454, 0xB22A7373, 0xD2523B3B,
+ 0x410B9F9F, 0x7B8B0202, 0xA088D8D8, 0x114FF3F3, 0x3167CBCB, 0xC2462727, 0x27C06767, 0x90B4FCFC,
+ 0x20283838, 0xF67F0404, 0x60784848, 0xFF2EE5E5, 0x96074C4C, 0x5C4B6565, 0xB1C72B2B, 0xAB6F8E8E,
+ 0x9E0D4242, 0x9CBBF5F5, 0x52F2DBDB, 0x1BF34A4A, 0x5FA63D3D, 0x9359A4A4, 0x0ABCB9B9, 0xEF3AF9F9,
+ 0x91EF1313, 0x85FE0808, 0x49019191, 0xEE611616, 0x2D7CDEDE, 0x4FB22121, 0x8F42B1B1, 0x3BDB7272,
+ 0x47B82F2F, 0x8748BFBF, 0x6D2CAEAE, 0x46E3C0C0, 0xD6573C3C, 0x3E859A9A, 0x6929A9A9, 0x647D4F4F,
+ 0x2A948181, 0xCE492E2E, 0xCB17C6C6, 0x2FCA6969, 0xFCC3BDBD, 0x975CA3A3, 0x055EE8E8, 0x7AD0EDED,
+ 0xAC87D1D1, 0x7F8E0505, 0xD5BA6464, 0x1AA8A5A5, 0x4BB72626, 0x0EB9BEBE, 0xA7608787, 0x5AF8D5D5,
+ 0x28223636, 0x14111B1B, 0x3FDE7575, 0x2979D9D9, 0x88AAEEEE, 0x3C332D2D, 0x4C5F7979, 0x02B6B7B7,
+ 0xB896CACA, 0xDA583535, 0xB09CC4C4, 0x17FC4343, 0x551A8484, 0x1FF64D4D, 0x8A1C5959, 0x7D38B2B2,
+ 0x57AC3333, 0xC718CFCF, 0x8DF40606, 0x74695353, 0xB7749B9B, 0xC4F59797, 0x9F56ADAD, 0x72DAE3E3,
+ 0x7ED5EAEA, 0x154AF4F4, 0x229E8F8F, 0x12A2ABAB, 0x584E6262, 0x07E85F5F, 0x99E51D1D, 0x34392323,
+ 0x6EC1F6F6, 0x50446C6C, 0xDE5D3232, 0x68724646, 0x6526A0A0, 0xBC93CDCD, 0xDB03DADA, 0xF8C6BABA,
+ 0xC8FA9E9E, 0xA882D6D6, 0x2BCF6E6E, 0x40507070, 0xDCEB8585, 0xFE750A0A, 0x328A9393, 0xA48DDFDF,
+ 0xCA4C2929, 0x10141C1C, 0x2173D7D7, 0xF0CCB4B4, 0xD309D4D4, 0x5D108A8A, 0x0FE25151, 0x00000000,
+ 0x6F9A1919, 0x9DE01A1A, 0x368F9494, 0x42E6C7C7, 0x4AECC9C9, 0x5EFDD2D2, 0xC1AB7F7F, 0xE0D8A8A8
+ );
+
+ /**
+ * M-Table
+ *
+ * @var Array
+ * @access private
+ */
+ var $m2 = array (
+ 0xBC75BC32, 0xECF3EC21, 0x20C62043, 0xB3F4B3C9, 0xDADBDA03, 0x027B028B, 0xE2FBE22B, 0x9EC89EFA,
+ 0xC94AC9EC, 0xD4D3D409, 0x18E6186B, 0x1E6B1E9F, 0x9845980E, 0xB27DB238, 0xA6E8A6D2, 0x264B26B7,
+ 0x3CD63C57, 0x9332938A, 0x82D882EE, 0x52FD5298, 0x7B377BD4, 0xBB71BB37, 0x5BF15B97, 0x47E14783,
+ 0x2430243C, 0x510F51E2, 0xBAF8BAC6, 0x4A1B4AF3, 0xBF87BF48, 0x0DFA0D70, 0xB006B0B3, 0x753F75DE,
+ 0xD25ED2FD, 0x7DBA7D20, 0x66AE6631, 0x3A5B3AA3, 0x598A591C, 0x00000000, 0xCDBCCD93, 0x1A9D1AE0,
+ 0xAE6DAE2C, 0x7FC17FAB, 0x2BB12BC7, 0xBE0EBEB9, 0xE080E0A0, 0x8A5D8A10, 0x3BD23B52, 0x64D564BA,
+ 0xD8A0D888, 0xE784E7A5, 0x5F075FE8, 0x1B141B11, 0x2CB52CC2, 0xFC90FCB4, 0x312C3127, 0x80A38065,
+ 0x73B2732A, 0x0C730C81, 0x794C795F, 0x6B546B41, 0x4B924B02, 0x53745369, 0x9436948F, 0x8351831F,
+ 0x2A382A36, 0xC4B0C49C, 0x22BD22C8, 0xD55AD5F8, 0xBDFCBDC3, 0x48604878, 0xFF62FFCE, 0x4C964C07,
+ 0x416C4177, 0xC742C7E6, 0xEBF7EB24, 0x1C101C14, 0x5D7C5D63, 0x36283622, 0x672767C0, 0xE98CE9AF,
+ 0x441344F9, 0x149514EA, 0xF59CF5BB, 0xCFC7CF18, 0x3F243F2D, 0xC046C0E3, 0x723B72DB, 0x5470546C,
+ 0x29CA294C, 0xF0E3F035, 0x088508FE, 0xC6CBC617, 0xF311F34F, 0x8CD08CE4, 0xA493A459, 0xCAB8CA96,
+ 0x68A6683B, 0xB883B84D, 0x38203828, 0xE5FFE52E, 0xAD9FAD56, 0x0B770B84, 0xC8C3C81D, 0x99CC99FF,
+ 0x580358ED, 0x196F199A, 0x0E080E0A, 0x95BF957E, 0x70407050, 0xF7E7F730, 0x6E2B6ECF, 0x1FE21F6E,
+ 0xB579B53D, 0x090C090F, 0x61AA6134, 0x57825716, 0x9F419F0B, 0x9D3A9D80, 0x11EA1164, 0x25B925CD,
+ 0xAFE4AFDD, 0x459A4508, 0xDFA4DF8D, 0xA397A35C, 0xEA7EEAD5, 0x35DA3558, 0xED7AEDD0, 0x431743FC,
+ 0xF866F8CB, 0xFB94FBB1, 0x37A137D3, 0xFA1DFA40, 0xC23DC268, 0xB4F0B4CC, 0x32DE325D, 0x9CB39C71,
+ 0x560B56E7, 0xE372E3DA, 0x87A78760, 0x151C151B, 0xF9EFF93A, 0x63D163BF, 0x345334A9, 0x9A3E9A85,
+ 0xB18FB142, 0x7C337CD1, 0x8826889B, 0x3D5F3DA6, 0xA1ECA1D7, 0xE476E4DF, 0x812A8194, 0x91499101,
+ 0x0F810FFB, 0xEE88EEAA, 0x16EE1661, 0xD721D773, 0x97C497F5, 0xA51AA5A8, 0xFEEBFE3F, 0x6DD96DB5,
+ 0x78C578AE, 0xC539C56D, 0x1D991DE5, 0x76CD76A4, 0x3EAD3EDC, 0xCB31CB67, 0xB68BB647, 0xEF01EF5B,
+ 0x1218121E, 0x602360C5, 0x6ADD6AB0, 0x4D1F4DF6, 0xCE4ECEE9, 0xDE2DDE7C, 0x55F9559D, 0x7E487E5A,
+ 0x214F21B2, 0x03F2037A, 0xA065A026, 0x5E8E5E19, 0x5A785A66, 0x655C654B, 0x6258624E, 0xFD19FD45,
+ 0x068D06F4, 0x40E54086, 0xF298F2BE, 0x335733AC, 0x17671790, 0x057F058E, 0xE805E85E, 0x4F644F7D,
+ 0x89AF896A, 0x10631095, 0x74B6742F, 0x0AFE0A75, 0x5CF55C92, 0x9BB79B74, 0x2D3C2D33, 0x30A530D6,
+ 0x2ECE2E49, 0x49E94989, 0x46684672, 0x77447755, 0xA8E0A8D8, 0x964D9604, 0x284328BD, 0xA969A929,
+ 0xD929D979, 0x862E8691, 0xD1ACD187, 0xF415F44A, 0x8D598D15, 0xD6A8D682, 0xB90AB9BC, 0x429E420D,
+ 0xF66EF6C1, 0x2F472FB8, 0xDDDFDD06, 0x23342339, 0xCC35CC62, 0xF16AF1C4, 0xC1CFC112, 0x85DC85EB,
+ 0x8F228F9E, 0x71C971A1, 0x90C090F0, 0xAA9BAA53, 0x018901F1, 0x8BD48BE1, 0x4EED4E8C, 0x8EAB8E6F,
+ 0xAB12ABA2, 0x6FA26F3E, 0xE60DE654, 0xDB52DBF2, 0x92BB927B, 0xB702B7B6, 0x692F69CA, 0x39A939D9,
+ 0xD3D7D30C, 0xA761A723, 0xA21EA2AD, 0xC3B4C399, 0x6C506C44, 0x07040705, 0x04F6047F, 0x27C22746,
+ 0xAC16ACA7, 0xD025D076, 0x50865013, 0xDC56DCF7, 0x8455841A, 0xE109E151, 0x7ABE7A25, 0x139113EF
+ );
+
+ /**
+ * M-Table
+ *
+ * @var Array
+ * @access private
+ */
+ var $m3 = array (
+ 0xD939A9D9, 0x90176790, 0x719CB371, 0xD2A6E8D2, 0x05070405, 0x9852FD98, 0x6580A365, 0xDFE476DF,
+ 0x08459A08, 0x024B9202, 0xA0E080A0, 0x665A7866, 0xDDAFE4DD, 0xB06ADDB0, 0xBF63D1BF, 0x362A3836,
+ 0x54E60D54, 0x4320C643, 0x62CC3562, 0xBEF298BE, 0x1E12181E, 0x24EBF724, 0xD7A1ECD7, 0x77416C77,
+ 0xBD2843BD, 0x32BC7532, 0xD47B37D4, 0x9B88269B, 0x700DFA70, 0xF94413F9, 0xB1FB94B1, 0x5A7E485A,
+ 0x7A03F27A, 0xE48CD0E4, 0x47B68B47, 0x3C24303C, 0xA5E784A5, 0x416B5441, 0x06DDDF06, 0xC56023C5,
+ 0x45FD1945, 0xA33A5BA3, 0x68C23D68, 0x158D5915, 0x21ECF321, 0x3166AE31, 0x3E6FA23E, 0x16578216,
+ 0x95106395, 0x5BEF015B, 0x4DB8834D, 0x91862E91, 0xB56DD9B5, 0x1F83511F, 0x53AA9B53, 0x635D7C63,
+ 0x3B68A63B, 0x3FFEEB3F, 0xD630A5D6, 0x257ABE25, 0xA7AC16A7, 0x0F090C0F, 0x35F0E335, 0x23A76123,
+ 0xF090C0F0, 0xAFE98CAF, 0x809D3A80, 0x925CF592, 0x810C7381, 0x27312C27, 0x76D02576, 0xE7560BE7,
+ 0x7B92BB7B, 0xE9CE4EE9, 0xF10189F1, 0x9F1E6B9F, 0xA93453A9, 0xC4F16AC4, 0x99C3B499, 0x975BF197,
+ 0x8347E183, 0x6B18E66B, 0xC822BDC8, 0x0E98450E, 0x6E1FE26E, 0xC9B3F4C9, 0x2F74B62F, 0xCBF866CB,
+ 0xFF99CCFF, 0xEA1495EA, 0xED5803ED, 0xF7DC56F7, 0xE18BD4E1, 0x1B151C1B, 0xADA21EAD, 0x0CD3D70C,
+ 0x2BE2FB2B, 0x1DC8C31D, 0x195E8E19, 0xC22CB5C2, 0x8949E989, 0x12C1CF12, 0x7E95BF7E, 0x207DBA20,
+ 0x6411EA64, 0x840B7784, 0x6DC5396D, 0x6A89AF6A, 0xD17C33D1, 0xA171C9A1, 0xCEFF62CE, 0x37BB7137,
+ 0xFB0F81FB, 0x3DB5793D, 0x51E10951, 0xDC3EADDC, 0x2D3F242D, 0xA476CDA4, 0x9D55F99D, 0xEE82D8EE,
+ 0x8640E586, 0xAE78C5AE, 0xCD25B9CD, 0x04964D04, 0x55774455, 0x0A0E080A, 0x13508613, 0x30F7E730,
+ 0xD337A1D3, 0x40FA1D40, 0x3461AA34, 0x8C4EED8C, 0xB3B006B3, 0x6C54706C, 0x2A73B22A, 0x523BD252,
+ 0x0B9F410B, 0x8B027B8B, 0x88D8A088, 0x4FF3114F, 0x67CB3167, 0x4627C246, 0xC06727C0, 0xB4FC90B4,
+ 0x28382028, 0x7F04F67F, 0x78486078, 0x2EE5FF2E, 0x074C9607, 0x4B655C4B, 0xC72BB1C7, 0x6F8EAB6F,
+ 0x0D429E0D, 0xBBF59CBB, 0xF2DB52F2, 0xF34A1BF3, 0xA63D5FA6, 0x59A49359, 0xBCB90ABC, 0x3AF9EF3A,
+ 0xEF1391EF, 0xFE0885FE, 0x01914901, 0x6116EE61, 0x7CDE2D7C, 0xB2214FB2, 0x42B18F42, 0xDB723BDB,
+ 0xB82F47B8, 0x48BF8748, 0x2CAE6D2C, 0xE3C046E3, 0x573CD657, 0x859A3E85, 0x29A96929, 0x7D4F647D,
+ 0x94812A94, 0x492ECE49, 0x17C6CB17, 0xCA692FCA, 0xC3BDFCC3, 0x5CA3975C, 0x5EE8055E, 0xD0ED7AD0,
+ 0x87D1AC87, 0x8E057F8E, 0xBA64D5BA, 0xA8A51AA8, 0xB7264BB7, 0xB9BE0EB9, 0x6087A760, 0xF8D55AF8,
+ 0x22362822, 0x111B1411, 0xDE753FDE, 0x79D92979, 0xAAEE88AA, 0x332D3C33, 0x5F794C5F, 0xB6B702B6,
+ 0x96CAB896, 0x5835DA58, 0x9CC4B09C, 0xFC4317FC, 0x1A84551A, 0xF64D1FF6, 0x1C598A1C, 0x38B27D38,
+ 0xAC3357AC, 0x18CFC718, 0xF4068DF4, 0x69537469, 0x749BB774, 0xF597C4F5, 0x56AD9F56, 0xDAE372DA,
+ 0xD5EA7ED5, 0x4AF4154A, 0x9E8F229E, 0xA2AB12A2, 0x4E62584E, 0xE85F07E8, 0xE51D99E5, 0x39233439,
+ 0xC1F66EC1, 0x446C5044, 0x5D32DE5D, 0x72466872, 0x26A06526, 0x93CDBC93, 0x03DADB03, 0xC6BAF8C6,
+ 0xFA9EC8FA, 0x82D6A882, 0xCF6E2BCF, 0x50704050, 0xEB85DCEB, 0x750AFE75, 0x8A93328A, 0x8DDFA48D,
+ 0x4C29CA4C, 0x141C1014, 0x73D72173, 0xCCB4F0CC, 0x09D4D309, 0x108A5D10, 0xE2510FE2, 0x00000000,
+ 0x9A196F9A, 0xE01A9DE0, 0x8F94368F, 0xE6C742E6, 0xECC94AEC, 0xFDD25EFD, 0xAB7FC1AB, 0xD8A8E0D8
+ );
+
+ /**
+ * The Key Schedule Array
+ *
+ * @var Array
+ * @access private
+ */
+ var $K = array();
+
+ /**
+ * The Key depended S-Table 0
+ *
+ * @var Array
+ * @access private
+ */
+ var $S0 = array();
+
+ /**
+ * The Key depended S-Table 1
+ *
+ * @var Array
+ * @access private
+ */
+ var $S1 = array();
+
+ /**
+ * The Key depended S-Table 2
+ *
+ * @var Array
+ * @access private
+ */
+ var $S2 = array();
+
+ /**
+ * The Key depended S-Table 3
+ *
+ * @var Array
+ * @access private
+ */
+ var $S3 = array();
+
+ /**
+ * Holds the last used key
+ *
+ * @var Array
+ * @access private
+ */
+ var $kl;
+
+ /**
+ * Sets the key.
+ *
+ * Keys can be of any length. Twofish, itself, requires the use of a key that's 128, 192 or 256-bits long.
+ * If the key is less than 256-bits we round the length up to the closest valid key length,
+ * padding $key with null bytes. If the key is more than 256-bits, we trim the excess bits.
+ *
+ * If the key is not explicitly set, it'll be assumed a 128 bits key to be all null bytes.
+ *
+ * @access public
+ * @see Crypt_Base::setKey()
+ * @param String $key
+ */
+ function setKey($key)
+ {
+ $keylength = strlen($key);
+ switch (true) {
+ case $keylength <= 16:
+ $key = str_pad($key, 16, "\0");
+ break;
+ case $keylength <= 24:
+ $key = str_pad($key, 24, "\0");
+ break;
+ case $keylength < 32:
+ $key = str_pad($key, 32, "\0");
+ break;
+ case $keylength > 32:
+ $key = substr($key, 0, 32);
+ }
+ parent::setKey($key);
+ }
+
+ /**
+ * Setup the key (expansion)
+ *
+ * @see Crypt_Base::_setupKey()
+ * @access private
+ */
+ function _setupKey()
+ {
+ if (isset($this->kl['key']) && $this->key === $this->kl['key']) {
+ // already expanded
+ return;
+ }
+ $this->kl = array('key' => $this->key);
+
+ /* Key expanding and generating the key-depended s-boxes */
+ $le_longs = unpack('V*', $this->key);
+ $key = unpack('C*', $this->key);
+ $m0 = $this->m0;
+ $m1 = $this->m1;
+ $m2 = $this->m2;
+ $m3 = $this->m3;
+ $q0 = $this->q0;
+ $q1 = $this->q1;
+
+ $K = $S0 = $S1 = $S2 = $S3 = array();
+
+ switch (strlen($this->key)) {
+ case 16:
+ list ($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[1], $le_longs[2]);
+ list ($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[3], $le_longs[4]);
+ for ($i = 0, $j = 1; $i < 40; $i+= 2,$j+= 2) {
+ $A = $m0[$q0[$q0[$i] ^ $key[ 9]] ^ $key[1]] ^
+ $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^
+ $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^
+ $m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]];
+ $B = $m0[$q0[$q0[$j] ^ $key[13]] ^ $key[5]] ^
+ $m1[$q0[$q1[$j] ^ $key[14]] ^ $key[6]] ^
+ $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^
+ $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]];
+ $B = ($B << 8) | ($B >> 24 & 0xff);
+ $K[] = $A+= $B;
+ $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
+ }
+ for ($i = 0; $i < 256; ++$i) {
+ $S0[$i] = $m0[$q0[$q0[$i] ^ $s4] ^ $s0];
+ $S1[$i] = $m1[$q0[$q1[$i] ^ $s5] ^ $s1];
+ $S2[$i] = $m2[$q1[$q0[$i] ^ $s6] ^ $s2];
+ $S3[$i] = $m3[$q1[$q1[$i] ^ $s7] ^ $s3];
+ }
+ break;
+ case 24:
+ list ($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[1], $le_longs[2]);
+ list ($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[3], $le_longs[4]);
+ list ($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[5], $le_longs[6]);
+ for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
+ $A = $m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
+ $m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
+ $m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
+ $m3[$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]] ^ $key[4]];
+ $B = $m0[$q0[$q0[$q1[$j] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^
+ $m1[$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
+ $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
+ $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]];
+ $B = ($B << 8) | ($B >> 24 & 0xff);
+ $K[] = $A+= $B;
+ $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
+ }
+ for ($i = 0; $i < 256; ++$i) {
+ $S0[$i] = $m0[$q0[$q0[$q1[$i] ^ $s8] ^ $s4] ^ $s0];
+ $S1[$i] = $m1[$q0[$q1[$q1[$i] ^ $s9] ^ $s5] ^ $s1];
+ $S2[$i] = $m2[$q1[$q0[$q0[$i] ^ $sa] ^ $s6] ^ $s2];
+ $S3[$i] = $m3[$q1[$q1[$q0[$i] ^ $sb] ^ $s7] ^ $s3];
+ }
+ break;
+ default: // 32
+ list ($sf, $se, $sd, $sc) = $this->_mdsrem($le_longs[1], $le_longs[2]);
+ list ($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[3], $le_longs[4]);
+ list ($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[5], $le_longs[6]);
+ list ($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[7], $le_longs[8]);
+ for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
+ $A = $m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
+ $m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
+ $m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
+ $m3[$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]] ^ $key[4]];
+ $B = $m0[$q0[$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^
+ $m1[$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
+ $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
+ $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]];
+ $B = ($B << 8) | ($B >> 24 & 0xff);
+ $K[] = $A+= $B;
+ $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
+ }
+ for ($i = 0; $i < 256; ++$i) {
+ $S0[$i] = $m0[$q0[$q0[$q1[$q1[$i] ^ $sc] ^ $s8] ^ $s4] ^ $s0];
+ $S1[$i] = $m1[$q0[$q1[$q1[$q0[$i] ^ $sd] ^ $s9] ^ $s5] ^ $s1];
+ $S2[$i] = $m2[$q1[$q0[$q0[$q0[$i] ^ $se] ^ $sa] ^ $s6] ^ $s2];
+ $S3[$i] = $m3[$q1[$q1[$q0[$q1[$i] ^ $sf] ^ $sb] ^ $s7] ^ $s3];
+ }
+ }
+
+ $this->K = $K;
+ $this->S0 = $S0;
+ $this->S1 = $S1;
+ $this->S2 = $S2;
+ $this->S3 = $S3;
+ }
+
+ /**
+ * _mdsrem function using by the twofish cipher algorithm
+ *
+ * @access private
+ * @param String $A
+ * @param String $B
+ * @return Array
+ */
+ function _mdsrem($A, $B)
+ {
+ // No gain by unrolling this loop.
+ for ($i = 0; $i < 8; ++$i) {
+ // Get most significant coefficient.
+ $t = 0xff & ($B >> 24);
+
+ // Shift the others up.
+ $B = ($B << 8) | (0xff & ($A >> 24));
+ $A<<= 8;
+
+ $u = $t << 1;
+
+ // Subtract the modular polynomial on overflow.
+ if ($t & 0x80) {
+ $u^= 0x14d;
+ }
+
+ // Remove t * (a * x^2 + 1).
+ $B ^= $t ^ ($u << 16);
+
+ // Form u = a*t + t/a = t*(a + 1/a).
+ $u^= 0x7fffffff & ($t >> 1);
+
+ // Add the modular polynomial on underflow.
+ if ($t & 0x01) $u^= 0xa6 ;
+
+ // Remove t * (a + 1/a) * (x^3 + x).
+ $B^= ($u << 24) | ($u << 8);
+ }
+
+ return array(
+ 0xff & $B >> 24,
+ 0xff & $B >> 16,
+ 0xff & $B >> 8,
+ 0xff & $B);
+ }
+
+ /**
+ * Encrypts a block
+ *
+ * @access private
+ * @param String $in
+ * @return String
+ */
+ function _encryptBlock($in)
+ {
+ $S0 = $this->S0;
+ $S1 = $this->S1;
+ $S2 = $this->S2;
+ $S3 = $this->S3;
+ $K = $this->K;
+
+ $in = unpack("V4", $in);
+ $R0 = $K[0] ^ $in[1];
+ $R1 = $K[1] ^ $in[2];
+ $R2 = $K[2] ^ $in[3];
+ $R3 = $K[3] ^ $in[4];
+
+ $ki = 7;
+ while ($ki < 39) {
+ $t0 = $S0[ $R0 & 0xff] ^
+ $S1[($R0 >> 8) & 0xff] ^
+ $S2[($R0 >> 16) & 0xff] ^
+ $S3[($R0 >> 24) & 0xff];
+ $t1 = $S0[($R1 >> 24) & 0xff] ^
+ $S1[ $R1 & 0xff] ^
+ $S2[($R1 >> 8) & 0xff] ^
+ $S3[($R1 >> 16) & 0xff];
+ $R2^= $t0 + $t1 + $K[++$ki];
+ $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
+ $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
+
+ $t0 = $S0[ $R2 & 0xff] ^
+ $S1[($R2 >> 8) & 0xff] ^
+ $S2[($R2 >> 16) & 0xff] ^
+ $S3[($R2 >> 24) & 0xff];
+ $t1 = $S0[($R3 >> 24) & 0xff] ^
+ $S1[ $R3 & 0xff] ^
+ $S2[($R3 >> 8) & 0xff] ^
+ $S3[($R3 >> 16) & 0xff];
+ $R0^= ($t0 + $t1 + $K[++$ki]);
+ $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
+ $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
+ }
+
+ // @codingStandardsIgnoreStart
+ return pack("V4", $K[4] ^ $R2,
+ $K[5] ^ $R3,
+ $K[6] ^ $R0,
+ $K[7] ^ $R1);
+ // @codingStandardsIgnoreEnd
+ }
+
+ /**
+ * Decrypts a block
+ *
+ * @access private
+ * @param String $in
+ * @return String
+ */
+ function _decryptBlock($in)
+ {
+ $S0 = $this->S0;
+ $S1 = $this->S1;
+ $S2 = $this->S2;
+ $S3 = $this->S3;
+ $K = $this->K;
+
+ $in = unpack("V4", $in);
+ $R0 = $K[4] ^ $in[1];
+ $R1 = $K[5] ^ $in[2];
+ $R2 = $K[6] ^ $in[3];
+ $R3 = $K[7] ^ $in[4];
+
+ $ki = 40;
+ while ($ki > 8) {
+ $t0 = $S0[$R0 & 0xff] ^
+ $S1[$R0 >> 8 & 0xff] ^
+ $S2[$R0 >> 16 & 0xff] ^
+ $S3[$R0 >> 24 & 0xff];
+ $t1 = $S0[$R1 >> 24 & 0xff] ^
+ $S1[$R1 & 0xff] ^
+ $S2[$R1 >> 8 & 0xff] ^
+ $S3[$R1 >> 16 & 0xff];
+ $R3^= $t0 + ($t1 << 1) + $K[--$ki];
+ $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
+ $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + $K[--$ki]);
+
+ $t0 = $S0[$R2 & 0xff] ^
+ $S1[$R2 >> 8 & 0xff] ^
+ $S2[$R2 >> 16 & 0xff] ^
+ $S3[$R2 >> 24 & 0xff];
+ $t1 = $S0[$R3 >> 24 & 0xff] ^
+ $S1[$R3 & 0xff] ^
+ $S2[$R3 >> 8 & 0xff] ^
+ $S3[$R3 >> 16 & 0xff];
+ $R1^= $t0 + ($t1 << 1) + $K[--$ki];
+ $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
+ $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + $K[--$ki]);
+ }
+
+ // @codingStandardsIgnoreStart
+ return pack("V4", $K[0] ^ $R2,
+ $K[1] ^ $R3,
+ $K[2] ^ $R0,
+ $K[3] ^ $R1);
+ // @codingStandardsIgnoreEnd
+ }
+
+ /**
+ * Setup the performance-optimized function for de/encrypt()
+ *
+ * @see Crypt_Base::_setupInlineCrypt()
+ * @access private
+ */
+ function _setupInlineCrypt()
+ {
+ $lambda_functions =& Crypt_Twofish::_getLambdaFunctions();
+
+ // Max. 10 Ultra-Hi-optimized inline-crypt functions. After that, we'll (still) create very fast code, but not the ultimate fast one.
+ $gen_hi_opt_code = (bool)( count($lambda_functions) < 10 );
+
+ switch (true) {
+ case $gen_hi_opt_code:
+ $code_hash = md5(str_pad("Crypt_Twofish, {$this->mode}, ", 32, "\0") . $this->key);
+ break;
+ default:
+ $code_hash = "Crypt_Twofish, {$this->mode}";
+ }
+
+ if (!isset($lambda_functions[$code_hash])) {
+ switch (true) {
+ case $gen_hi_opt_code:
+ $K = $this->K;
+
+ $init_crypt = '
+ static $S0, $S1, $S2, $S3;
+ if (!$S0) {
+ for ($i = 0; $i < 256; ++$i) {
+ $S0[] = (int)$self->S0[$i];
+ $S1[] = (int)$self->S1[$i];
+ $S2[] = (int)$self->S2[$i];
+ $S3[] = (int)$self->S3[$i];
+ }
+ }
+ ';
+ break;
+ default:
+ $K = array();
+ for ($i = 0; $i < 40; ++$i) {
+ $K[] = '$K_' . $i;
+ }
+
+ $init_crypt = '
+ $S0 = $self->S0;
+ $S1 = $self->S1;
+ $S2 = $self->S2;
+ $S3 = $self->S3;
+ list(' . implode(',', $K) . ') = $self->K;
+ ';
+ }
+
+ // Generating encrypt code:
+ $encrypt_block = '
+ $in = unpack("V4", $in);
+ $R0 = '.$K[0].' ^ $in[1];
+ $R1 = '.$K[1].' ^ $in[2];
+ $R2 = '.$K[2].' ^ $in[3];
+ $R3 = '.$K[3].' ^ $in[4];
+ ';
+ for ($ki = 7, $i = 0; $i < 8; ++$i) {
+ $encrypt_block.= '
+ $t0 = $S0[ $R0 & 0xff] ^
+ $S1[($R0 >> 8) & 0xff] ^
+ $S2[($R0 >> 16) & 0xff] ^
+ $S3[($R0 >> 24) & 0xff];
+ $t1 = $S0[($R1 >> 24) & 0xff] ^
+ $S1[ $R1 & 0xff] ^
+ $S2[($R1 >> 8) & 0xff] ^
+ $S3[($R1 >> 16) & 0xff];
+ $R2^= ($t0 + $t1 + '.$K[++$ki].');
+ $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
+ $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + '.$K[++$ki].');
+
+ $t0 = $S0[ $R2 & 0xff] ^
+ $S1[($R2 >> 8) & 0xff] ^
+ $S2[($R2 >> 16) & 0xff] ^
+ $S3[($R2 >> 24) & 0xff];
+ $t1 = $S0[($R3 >> 24) & 0xff] ^
+ $S1[ $R3 & 0xff] ^
+ $S2[($R3 >> 8) & 0xff] ^
+ $S3[($R3 >> 16) & 0xff];
+ $R0^= ($t0 + $t1 + '.$K[++$ki].');
+ $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
+ $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + '.$K[++$ki].');
+ ';
+ }
+ $encrypt_block.= '
+ $in = pack("V4", '.$K[4].' ^ $R2,
+ '.$K[5].' ^ $R3,
+ '.$K[6].' ^ $R0,
+ '.$K[7].' ^ $R1);
+ ';
+
+ // Generating decrypt code:
+ $decrypt_block = '
+ $in = unpack("V4", $in);
+ $R0 = '.$K[4].' ^ $in[1];
+ $R1 = '.$K[5].' ^ $in[2];
+ $R2 = '.$K[6].' ^ $in[3];
+ $R3 = '.$K[7].' ^ $in[4];
+ ';
+ for ($ki = 40, $i = 0; $i < 8; ++$i) {
+ $decrypt_block.= '
+ $t0 = $S0[$R0 & 0xff] ^
+ $S1[$R0 >> 8 & 0xff] ^
+ $S2[$R0 >> 16 & 0xff] ^
+ $S3[$R0 >> 24 & 0xff];
+ $t1 = $S0[$R1 >> 24 & 0xff] ^
+ $S1[$R1 & 0xff] ^
+ $S2[$R1 >> 8 & 0xff] ^
+ $S3[$R1 >> 16 & 0xff];
+ $R3^= $t0 + ($t1 << 1) + '.$K[--$ki].';
+ $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
+ $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + '.$K[--$ki].');
+
+ $t0 = $S0[$R2 & 0xff] ^
+ $S1[$R2 >> 8 & 0xff] ^
+ $S2[$R2 >> 16 & 0xff] ^
+ $S3[$R2 >> 24 & 0xff];
+ $t1 = $S0[$R3 >> 24 & 0xff] ^
+ $S1[$R3 & 0xff] ^
+ $S2[$R3 >> 8 & 0xff] ^
+ $S3[$R3 >> 16 & 0xff];
+ $R1^= $t0 + ($t1 << 1) + '.$K[--$ki].';
+ $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
+ $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + '.$K[--$ki].');
+ ';
+ }
+ $decrypt_block.= '
+ $in = pack("V4", '.$K[0].' ^ $R2,
+ '.$K[1].' ^ $R3,
+ '.$K[2].' ^ $R0,
+ '.$K[3].' ^ $R1);
+ ';
+
+ $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+ array(
+ 'init_crypt' => $init_crypt,
+ 'init_encrypt' => '',
+ 'init_decrypt' => '',
+ 'encrypt_block' => $encrypt_block,
+ 'decrypt_block' => $decrypt_block
+ )
+ );
+ }
+ $this->inline_crypt = $lambda_functions[$code_hash];
+ }
+}
diff --git a/vendor/phpseclib/File/ANSI.php b/vendor/phpseclib/File/ANSI.php
new file mode 100644
index 0000000000..6c85ec36ab
--- /dev/null
+++ b/vendor/phpseclib/File/ANSI.php
@@ -0,0 +1,562 @@
+
+ * @copyright MMXII Jim Wigginton
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link http://phpseclib.sourceforge.net
+ */
+
+/**
+ * Pure-PHP ANSI Decoder
+ *
+ * @package File_ANSI
+ * @author Jim Wigginton
+ * @access public
+ */
+class File_ANSI
+{
+ /**
+ * Max Width
+ *
+ * @var Integer
+ * @access private
+ */
+ var $max_x;
+
+ /**
+ * Max Height
+ *
+ * @var Integer
+ * @access private
+ */
+ var $max_y;
+
+ /**
+ * Max History
+ *
+ * @var Integer
+ * @access private
+ */
+ var $max_history;
+
+ /**
+ * History
+ *
+ * @var Array
+ * @access private
+ */
+ var $history;
+
+ /**
+ * History Attributes
+ *
+ * @var Array
+ * @access private
+ */
+ var $history_attrs;
+
+ /**
+ * Current Column
+ *
+ * @var Integer
+ * @access private
+ */
+ var $x;
+
+ /**
+ * Current Row
+ *
+ * @var Integer
+ * @access private
+ */
+ var $y;
+
+ /**
+ * Old Column
+ *
+ * @var Integer
+ * @access private
+ */
+ var $old_x;
+
+ /**
+ * Old Row
+ *
+ * @var Integer
+ * @access private
+ */
+ var $old_y;
+
+ /**
+ * An empty attribute row
+ *
+ * @var Array
+ * @access private
+ */
+ var $attr_row;
+
+ /**
+ * The current screen text
+ *
+ * @var Array
+ * @access private
+ */
+ var $screen;
+
+ /**
+ * The current screen attributes
+ *
+ * @var Array
+ * @access private
+ */
+ var $attrs;
+
+ /**
+ * The current foreground color
+ *
+ * @var String
+ * @access private
+ */
+ var $foreground;
+
+ /**
+ * The current background color
+ *
+ * @var String
+ * @access private
+ */
+ var $background;
+
+ /**
+ * Bold flag
+ *
+ * @var Boolean
+ * @access private
+ */
+ var $bold;
+
+ /**
+ * Underline flag
+ *
+ * @var Boolean
+ * @access private
+ */
+ var $underline;
+
+ /**
+ * Blink flag
+ *
+ * @var Boolean
+ * @access private
+ */
+ var $blink;
+
+ /**
+ * Reverse flag
+ *
+ * @var Boolean
+ * @access private
+ */
+ var $reverse;
+
+ /**
+ * Color flag
+ *
+ * @var Boolean
+ * @access private
+ */
+ var $color;
+
+ /**
+ * Current ANSI code
+ *
+ * @var String
+ * @access private
+ */
+ var $ansi;
+
+ /**
+ * Default Constructor.
+ *
+ * @return File_ANSI
+ * @access public
+ */
+ function __construct()
+ {
+ $this->setHistory(200);
+ $this->setDimensions(80, 24);
+ }
+
+ /**
+ * Set terminal width and height
+ *
+ * Resets the screen as well
+ *
+ * @param Integer $x
+ * @param Integer $y
+ * @access public
+ */
+ function setDimensions($x, $y)
+ {
+ $this->max_x = $x - 1;
+ $this->max_y = $y - 1;
+ $this->x = $this->y = 0;
+ $this->history = $this->history_attrs = array();
+ $this->attr_row = array_fill(0, $this->max_x + 1, '');
+ $this->screen = array_fill(0, $this->max_y + 1, '');
+ $this->attrs = array_fill(0, $this->max_y + 1, $this->attr_row);
+ $this->foreground = 'white';
+ $this->background = 'black';
+ $this->bold = false;
+ $this->underline = false;
+ $this->blink = false;
+ $this->reverse = false;
+ $this->color = false;
+
+ $this->ansi = '';
+ }
+
+ /**
+ * Set the number of lines that should be logged past the terminal height
+ *
+ * @param Integer $x
+ * @param Integer $y
+ * @access public
+ */
+ function setHistory($history)
+ {
+ $this->max_history = $history;
+ }
+
+ /**
+ * Load a string
+ *
+ * @param String $source
+ * @access public
+ */
+ function loadString($source)
+ {
+ $this->setDimensions($this->max_x + 1, $this->max_y + 1);
+ $this->appendString($source);
+ }
+
+ /**
+ * Appdend a string
+ *
+ * @param String $source
+ * @access public
+ */
+ function appendString($source)
+ {
+ for ($i = 0; $i < strlen($source); $i++) {
+ if (strlen($this->ansi)) {
+ $this->ansi.= $source[$i];
+ $chr = ord($source[$i]);
+ // http://en.wikipedia.org/wiki/ANSI_escape_code#Sequence_elements
+ // single character CSI's not currently supported
+ switch (true) {
+ case $this->ansi == "\x1B=":
+ $this->ansi = '';
+ continue 2;
+ case strlen($this->ansi) == 2 && $chr >= 64 && $chr <= 95 && $chr != ord('['):
+ case strlen($this->ansi) > 2 && $chr >= 64 && $chr <= 126:
+ break;
+ default:
+ continue 2;
+ }
+ // http://ascii-table.com/ansi-escape-sequences-vt-100.php
+ switch ($this->ansi) {
+ case "\x1B[H": // Move cursor to upper left corner
+ $this->old_x = $this->x;
+ $this->old_y = $this->y;
+ $this->x = $this->y = 0;
+ break;
+ case "\x1B[J": // Clear screen from cursor down
+ $this->history = array_merge($this->history, array_slice(array_splice($this->screen, $this->y + 1), 0, $this->old_y));
+ $this->screen = array_merge($this->screen, array_fill($this->y, $this->max_y, ''));
+
+ $this->history_attrs = array_merge($this->history_attrs, array_slice(array_splice($this->attrs, $this->y + 1), 0, $this->old_y));
+ $this->attrs = array_merge($this->attrs, array_fill($this->y, $this->max_y, $this->attr_row));
+
+ if (count($this->history) == $this->max_history) {
+ array_shift($this->history);
+ array_shift($this->history_attrs);
+ }
+ case "\x1B[K": // Clear screen from cursor right
+ $this->screen[$this->y] = substr($this->screen[$this->y], 0, $this->x);
+
+ array_splice($this->attrs[$this->y], $this->x + 1);
+ break;
+ case "\x1B[2K": // Clear entire line
+ $this->screen[$this->y] = str_repeat(' ', $this->x);
+ $this->attrs[$this->y] = $this->attr_row;
+ break;
+ case "\x1B[?1h": // set cursor key to application
+ case "\x1B[?25h": // show the cursor
+ break;
+ case "\x1BE": // Move to next line
+ $this->_newLine();
+ $this->x = 0;
+ break;
+ default:
+ switch (true) {
+ case preg_match('#\x1B\[(\d+);(\d+)H#', $this->ansi, $match): // Move cursor to screen location v,h
+ $this->old_x = $this->x;
+ $this->old_y = $this->y;
+ $this->x = $match[2] - 1;
+ $this->y = $match[1] - 1;
+ break;
+ case preg_match('#\x1B\[(\d+)C#', $this->ansi, $match): // Move cursor right n lines
+ $this->old_x = $this->x;
+ $x = $match[1] - 1;
+ break;
+ case preg_match('#\x1B\[(\d+);(\d+)r#', $this->ansi, $match): // Set top and bottom lines of a window
+ break;
+ case preg_match('#\x1B\[(\d*(?:;\d*)*)m#', $this->ansi, $match): // character attributes
+ $mods = explode(';', $match[1]);
+ foreach ($mods as $mod) {
+ switch ($mod) {
+ case 0: // Turn off character attributes
+ $this->attrs[$this->y][$this->x] = '';
+
+ if ($this->bold) $this->attrs[$this->y][$this->x].= '';
+ if ($this->underline) $this->attrs[$this->y][$this->x].= '';
+ if ($this->blink) $this->attrs[$this->y][$this->x].= '';
+ if ($this->color) $this->attrs[$this->y][$this->x].= '';
+
+ if ($this->reverse) {
+ $temp = $this->background;
+ $this->background = $this->foreground;
+ $this->foreground = $temp;
+ }
+
+ $this->bold = $this->underline = $this->blink = $this->color = $this->reverse = false;
+ break;
+ case 1: // Turn bold mode on
+ if (!$this->bold) {
+ $this->attrs[$this->y][$this->x] = '';
+ $this->bold = true;
+ }
+ break;
+ case 4: // Turn underline mode on
+ if (!$this->underline) {
+ $this->attrs[$this->y][$this->x] = '';
+ $this->underline = true;
+ }
+ break;
+ case 5: // Turn blinking mode on
+ if (!$this->blink) {
+ $this->attrs[$this->y][$this->x] = '