PEAR Channel: [phpseclib.sourceforge.net](http://phpseclib.sourceforge.net/pear.htm)
@@ -16,7 +16,7 @@ PEAR Channel: [phpseclib.sourceforge.net](http://phpseclib.sourceforge.net/pear.
## Documentation
* [Documentation / Manual](http://phpseclib.sourceforge.net/)
-* [API Documentation](http://phpseclib.bantux.org/api/2.0/) (generated by Sami)
+* [API Documentation](http://phpseclib.bantux.org/api/master/) (generated by Sami)
## Support
@@ -40,7 +40,7 @@ Dependencies are managed via Composer.
2. Install Dependencies
``` sh
- php composer.phar install --dev
+ php composer.phar install
```
## Contributing
diff --git a/composer.json b/composer.json
index fe695fe4..da2e1c22 100644
--- a/composer.json
+++ b/composer.json
@@ -43,9 +43,15 @@
"name": "Hans-Jürgen Petrich",
"email": "petrich@tronic-media.com",
"role": "Developer"
+ },
+ {
+ "name": "Graham Campbell",
+ "email": "graham@alt-three.com",
+ "role": "Developer"
}
],
"require": {
+ "paragonie/random_compat": "^1.4|^2.0",
"php": ">=5.3.3"
},
"require-dev": {
@@ -56,10 +62,10 @@
},
"suggest": {
"ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
- "ext-mcrypt": "Install the Mcrypt extension in order to speed up a wide variety of cryptographic operations.",
+ "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
+ "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
},
- "include-path": ["phpseclib/"],
"autoload": {
"files": [
"phpseclib/bootstrap.php"
diff --git a/composer.lock b/composer.lock
index 3e6e5c49..7fbfdcb1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,21 +4,71 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "98a14889a81b2d6ecbb029483e954dec",
- "packages": [],
- "packages-dev": [
+ "hash": "deb73cf7e6004dbc2550a38c4082df2d",
+ "content-hash": "39f9dd8d2c209ff69eebbb83e367257e",
+ "packages": [
{
- "name": "doctrine/instantiator",
- "version": "1.0.4",
+ "name": "paragonie/random_compat",
+ "version": "v2.0.2",
"source": {
"type": "git",
- "url": "https://github.com/doctrine/instantiator.git",
- "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
+ "url": "https://github.com/paragonie/random_compat.git",
+ "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
- "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
+ "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.2.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "4.*|5.*"
+ },
+ "suggest": {
+ "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+ },
+ "type": "library",
+ "autoload": {
+ "files": [
+ "lib/random.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com",
+ "homepage": "https://paragonie.com"
+ }
+ ],
+ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+ "keywords": [
+ "csprng",
+ "pseudorandom",
+ "random"
+ ],
+ "time": "2016-04-03 06:00:07"
+ }
+ ],
+ "packages-dev": [
+ {
+ "name": "doctrine/instantiator",
+ "version": "1.0.5",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/doctrine/instantiator.git",
+ "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+ "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
"shasum": ""
},
"require": {
@@ -29,7 +79,7 @@
"ext-pdo": "*",
"ext-phar": "*",
"phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "2.0.*@ALPHA"
+ "squizlabs/php_codesniffer": "~2.0"
},
"type": "library",
"extra": {
@@ -38,8 +88,8 @@
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Instantiator\\": "src"
+ "psr-4": {
+ "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -59,20 +109,20 @@
"constructor",
"instantiate"
],
- "time": "2014-10-13 12:58:55"
+ "time": "2015-06-14 21:17:01"
},
{
"name": "michelf/php-markdown",
- "version": "1.4.1",
+ "version": "1.6.0",
"source": {
"type": "git",
"url": "https://github.com/michelf/php-markdown.git",
- "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6"
+ "reference": "156e56ee036505ec637d761ee62dc425d807183c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/michelf/php-markdown/zipball/de9a19c7bf352d41cc99ed86c3c0ef17e87394b6",
- "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6",
+ "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c",
+ "reference": "156e56ee036505ec637d761ee62dc425d807183c",
"shasum": ""
},
"require": {
@@ -97,20 +147,20 @@
{
"name": "Michel Fortin",
"email": "michel.fortin@michelf.ca",
- "homepage": "http://michelf.ca/",
+ "homepage": "https://michelf.ca/",
"role": "Developer"
},
{
"name": "John Gruber",
- "homepage": "http://daringfireball.net/"
+ "homepage": "https://daringfireball.net/"
}
],
"description": "PHP Markdown",
- "homepage": "http://michelf.ca/projects/php-markdown/",
+ "homepage": "https://michelf.ca/projects/php-markdown/",
"keywords": [
"markdown"
],
- "time": "2014-05-05 02:43:50"
+ "time": "2015-12-24 01:37:31"
},
{
"name": "nikic/php-parser",
@@ -159,16 +209,16 @@
},
{
"name": "phing/phing",
- "version": "2.9.1",
+ "version": "2.14.0",
"source": {
"type": "git",
"url": "https://github.com/phingofficial/phing.git",
- "reference": "393edeffa8a85d43636ce0c9b4deb1ff9ac60a5c"
+ "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phingofficial/phing/zipball/393edeffa8a85d43636ce0c9b4deb1ff9ac60a5c",
- "reference": "393edeffa8a85d43636ce0c9b4deb1ff9ac60a5c",
+ "url": "https://api.github.com/repos/phingofficial/phing/zipball/7dd73c83c377623def54b58121f46b4dcb35dd61",
+ "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61",
"shasum": ""
},
"require": {
@@ -177,20 +227,22 @@
"require-dev": {
"ext-pdo_sqlite": "*",
"lastcraft/simpletest": "@dev",
- "pdepend/pdepend": "1.x",
- "pear-pear.php.net/http_request2": "2.2.x",
- "pear-pear.php.net/net_growl": "2.7.x",
- "pear-pear.php.net/pear_packagefilemanager": "1.7.x",
- "pear-pear.php.net/pear_packagefilemanager2": "1.0.x",
- "pear-pear.php.net/xml_serializer": "0.20.x",
- "pear/pear_exception": "@dev",
+ "mikey179/vfsstream": "^1.6",
+ "pdepend/pdepend": "2.x",
+ "pear/archive_tar": "1.4.x",
+ "pear/http_request2": "dev-trunk",
+ "pear/net_growl": "dev-trunk",
+ "pear/pear-core-minimal": "1.10.1",
"pear/versioncontrol_git": "@dev",
- "pear/versioncontrol_svn": "@dev",
+ "pear/versioncontrol_svn": "~0.5",
"phpdocumentor/phpdocumentor": "2.x",
- "phploc/phploc": "2.x",
+ "phploc/phploc": "~2.0.6",
+ "phpmd/phpmd": "~2.2",
"phpunit/phpunit": ">=3.7",
+ "sebastian/git": "~1.0",
"sebastian/phpcpd": "2.x",
- "squizlabs/php_codesniffer": "1.5.x"
+ "squizlabs/php_codesniffer": "~2.2",
+ "symfony/yaml": "~2.7"
},
"suggest": {
"pdepend/pdepend": "PHP version of JDepend",
@@ -211,7 +263,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.9.x-dev"
+ "dev-master": "2.14.x-dev"
}
},
"autoload": {
@@ -227,24 +279,24 @@
"LGPL-3.0"
],
"authors": [
- {
- "name": "Phing Community",
- "homepage": "http://www.phing.info/trac/wiki/Development/Contributors"
- },
{
"name": "Michiel Rook",
"email": "mrook@php.net"
+ },
+ {
+ "name": "Phing Community",
+ "homepage": "https://www.phing.info/trac/wiki/Development/Contributors"
}
],
"description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
- "homepage": "http://www.phing.info/",
+ "homepage": "https://www.phing.info/",
"keywords": [
"build",
"phing",
"task",
"tool"
],
- "time": "2014-12-03 09:18:46"
+ "time": "2016-03-10 21:39:23"
},
{
"name": "phpdocumentor/reflection-docblock",
@@ -297,21 +349,24 @@
},
{
"name": "phpspec/prophecy",
- "version": "v1.3.1",
+ "version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9"
+ "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/9ca52329bcdd1500de24427542577ebf3fc2f1c9",
- "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972",
+ "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "~1.0,>=1.0.2",
- "phpdocumentor/reflection-docblock": "~2.0"
+ "doctrine/instantiator": "^1.0.2",
+ "php": "^5.3|^7.0",
+ "phpdocumentor/reflection-docblock": "~2.0",
+ "sebastian/comparator": "~1.1",
+ "sebastian/recursion-context": "~1.0"
},
"require-dev": {
"phpspec/phpspec": "~2.0"
@@ -319,7 +374,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.5.x-dev"
}
},
"autoload": {
@@ -343,7 +398,7 @@
}
],
"description": "Highly opinionated mocking framework for PHP 5.3+",
- "homepage": "http://phpspec.org",
+ "homepage": "https://github.com/phpspec/prophecy",
"keywords": [
"Double",
"Dummy",
@@ -352,20 +407,20 @@
"spy",
"stub"
],
- "time": "2014-11-17 16:23:49"
+ "time": "2016-02-15 07:46:21"
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.0.15",
+ "version": "2.2.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "34cc484af1ca149188d0d9e91412191e398e0b67"
+ "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/34cc484af1ca149188d0d9e91412191e398e0b67",
- "reference": "34cc484af1ca149188d0d9e91412191e398e0b67",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+ "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
"shasum": ""
},
"require": {
@@ -373,7 +428,7 @@
"phpunit/php-file-iterator": "~1.3",
"phpunit/php-text-template": "~1.2",
"phpunit/php-token-stream": "~1.3",
- "sebastian/environment": "~1.0",
+ "sebastian/environment": "^1.3.2",
"sebastian/version": "~1.0"
},
"require-dev": {
@@ -388,7 +443,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "2.2.x-dev"
}
},
"autoload": {
@@ -414,35 +469,37 @@
"testing",
"xunit"
],
- "time": "2015-01-24 10:06:35"
+ "time": "2015-10-06 15:47:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "1.3.4",
+ "version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+ "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
- "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+ "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.4.x-dev"
+ }
+ },
"autoload": {
"classmap": [
- "File/"
+ "src/"
]
},
"notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
"license": [
"BSD-3-Clause"
],
@@ -459,20 +516,20 @@
"filesystem",
"iterator"
],
- "time": "2013-10-10 15:34:57"
+ "time": "2015-06-21 13:08:43"
},
{
"name": "phpunit/php-text-template",
- "version": "1.2.0",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-text-template.git",
- "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
+ "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
- "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+ "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
"shasum": ""
},
"require": {
@@ -481,20 +538,17 @@
"type": "library",
"autoload": {
"classmap": [
- "Text/"
+ "src/"
]
},
"notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
+ "email": "sebastian@phpunit.de",
"role": "lead"
}
],
@@ -503,20 +557,20 @@
"keywords": [
"template"
],
- "time": "2014-01-30 17:20:04"
+ "time": "2015-06-21 13:50:34"
},
{
"name": "phpunit/php-timer",
- "version": "1.0.5",
+ "version": "1.0.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
+ "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
- "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+ "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
"shasum": ""
},
"require": {
@@ -525,13 +579,10 @@
"type": "library",
"autoload": {
"classmap": [
- "PHP/"
+ "src/"
]
},
"notification-url": "https://packagist.org/downloads/",
- "include-path": [
- ""
- ],
"license": [
"BSD-3-Clause"
],
@@ -547,20 +598,20 @@
"keywords": [
"timer"
],
- "time": "2013-08-02 07:42:54"
+ "time": "2015-06-21 08:01:12"
},
{
"name": "phpunit/php-token-stream",
- "version": "1.4.0",
+ "version": "1.4.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74"
+ "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db32c18eba00b121c145575fcbcd4d4d24e6db74",
- "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+ "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
"shasum": ""
},
"require": {
@@ -596,20 +647,20 @@
"keywords": [
"tokenizer"
],
- "time": "2015-01-17 09:51:32"
+ "time": "2015-09-15 10:49:45"
},
{
"name": "phpunit/phpunit",
- "version": "4.5.0",
+ "version": "4.8.24",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5"
+ "reference": "a1066c562c52900a142a0e2bbf0582994671385e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5b578d3865a9128b9c209b011fda6539ec06e7a5",
- "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e",
+ "reference": "a1066c562c52900a142a0e2bbf0582994671385e",
"shasum": ""
},
"require": {
@@ -619,19 +670,19 @@
"ext-reflection": "*",
"ext-spl": "*",
"php": ">=5.3.3",
- "phpspec/prophecy": "~1.3.1",
- "phpunit/php-code-coverage": "~2.0",
- "phpunit/php-file-iterator": "~1.3.2",
+ "phpspec/prophecy": "^1.3.1",
+ "phpunit/php-code-coverage": "~2.1",
+ "phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
- "phpunit/php-timer": "~1.0.2",
+ "phpunit/php-timer": ">=1.0.6",
"phpunit/phpunit-mock-objects": "~2.3",
"sebastian/comparator": "~1.1",
- "sebastian/diff": "~1.1",
- "sebastian/environment": "~1.2",
+ "sebastian/diff": "~1.2",
+ "sebastian/environment": "~1.3",
"sebastian/exporter": "~1.2",
"sebastian/global-state": "~1.0",
"sebastian/version": "~1.0",
- "symfony/yaml": "~2.0"
+ "symfony/yaml": "~2.1|~3.0"
},
"suggest": {
"phpunit/php-invoker": "~1.1"
@@ -642,7 +693,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.5.x-dev"
+ "dev-master": "4.8.x-dev"
}
},
"autoload": {
@@ -668,29 +719,30 @@
"testing",
"xunit"
],
- "time": "2015-02-05 15:51:19"
+ "time": "2016-03-14 06:16:08"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "2.3.0",
+ "version": "2.3.8",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "c63d2367247365f688544f0d500af90a11a44c65"
+ "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65",
- "reference": "c63d2367247365f688544f0d500af90a11a44c65",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+ "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "~1.0,>=1.0.1",
+ "doctrine/instantiator": "^1.0.2",
"php": ">=5.3.3",
- "phpunit/php-text-template": "~1.2"
+ "phpunit/php-text-template": "~1.2",
+ "sebastian/exporter": "~1.2"
},
"require-dev": {
- "phpunit/phpunit": "~4.3"
+ "phpunit/phpunit": "~4.4"
},
"suggest": {
"ext-soap": "*"
@@ -723,7 +775,7 @@
"mock",
"xunit"
],
- "time": "2014-10-03 05:12:11"
+ "time": "2015-10-02 06:51:40"
},
{
"name": "pimple/pimple",
@@ -830,16 +882,16 @@
},
{
"name": "sebastian/comparator",
- "version": "1.1.1",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
+ "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
- "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+ "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
"shasum": ""
},
"require": {
@@ -853,7 +905,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -890,32 +942,32 @@
"compare",
"equality"
],
- "time": "2015-01-29 16:28:08"
+ "time": "2015-07-26 15:48:44"
},
{
"name": "sebastian/diff",
- "version": "1.2.0",
+ "version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/diff.git",
- "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
+ "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
- "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
+ "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+ "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "phpunit/phpunit": "~4.2"
+ "phpunit/phpunit": "~4.8"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -938,36 +990,36 @@
}
],
"description": "Diff implementation",
- "homepage": "http://www.github.com/sebastianbergmann/diff",
+ "homepage": "https://github.com/sebastianbergmann/diff",
"keywords": [
"diff"
],
- "time": "2014-08-15 10:29:00"
+ "time": "2015-12-08 07:14:41"
},
{
"name": "sebastian/environment",
- "version": "1.2.1",
+ "version": "1.3.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7"
+ "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7",
- "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
+ "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
- "phpunit/phpunit": "~4.3"
+ "phpunit/phpunit": "~4.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -992,20 +1044,20 @@
"environment",
"hhvm"
],
- "time": "2014-10-25 08:00:45"
+ "time": "2016-02-26 18:40:46"
},
{
"name": "sebastian/exporter",
- "version": "1.2.0",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "84839970d05254c73cde183a721c7af13aede943"
+ "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
- "reference": "84839970d05254c73cde183a721c7af13aede943",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
+ "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
"shasum": ""
},
"require": {
@@ -1058,20 +1110,20 @@
"export",
"exporter"
],
- "time": "2015-01-27 07:23:06"
+ "time": "2015-06-21 07:55:53"
},
{
"name": "sebastian/global-state",
- "version": "1.0.0",
+ "version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/global-state.git",
- "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+ "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
- "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+ "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+ "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
"shasum": ""
},
"require": {
@@ -1109,20 +1161,20 @@
"keywords": [
"global state"
],
- "time": "2014-10-06 09:23:50"
+ "time": "2015-10-12 03:26:01"
},
{
"name": "sebastian/recursion-context",
- "version": "1.0.0",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
+ "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
- "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
+ "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
"shasum": ""
},
"require": {
@@ -1162,20 +1214,20 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2015-01-24 09:48:32"
+ "time": "2015-11-11 19:50:13"
},
{
"name": "sebastian/version",
- "version": "1.0.4",
+ "version": "1.0.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/version.git",
- "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b"
+ "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b",
- "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b",
+ "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+ "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
"shasum": ""
},
"type": "library",
@@ -1197,27 +1249,31 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2014-12-15 14:25:24"
+ "time": "2015-06-21 13:59:46"
},
{
"name": "squizlabs/php_codesniffer",
- "version": "2.3.3",
+ "version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "c1a26c729508f73560c1a4f767f60b8ab6b4a666"
+ "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/c1a26c729508f73560c1a4f767f60b8ab6b4a666",
- "reference": "c1a26c729508f73560c1a4f767f60b8ab6b4a666",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1bcdf03b068a530ac1962ce671dead356eeba43b",
+ "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b",
"shasum": ""
},
"require": {
+ "ext-simplexml": "*",
"ext-tokenizer": "*",
"ext-xmlwriter": "*",
"php": ">=5.1.2"
},
+ "require-dev": {
+ "phpunit/phpunit": "~4.0"
+ },
"bin": [
"scripts/phpcs",
"scripts/phpcbf"
@@ -1225,7 +1281,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0.x-dev"
+ "dev-master": "2.x-dev"
}
},
"autoload": {
@@ -1271,30 +1327,30 @@
"phpcs",
"standards"
],
- "time": "2015-06-24 03:16:23"
+ "time": "2016-04-03 22:58:34"
},
{
"name": "symfony/console",
- "version": "v2.6.4",
- "target-dir": "Symfony/Component/Console",
+ "version": "v2.8.4",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Console.git",
- "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34"
+ "url": "https://github.com/symfony/console.git",
+ "reference": "9a5aef5fc0d4eff86853d44202b02be8d5a20154"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
- "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
+ "url": "https://api.github.com/repos/symfony/console/zipball/9a5aef5fc0d4eff86853d44202b02be8d5a20154",
+ "reference": "9a5aef5fc0d4eff86853d44202b02be8d5a20154",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9",
+ "symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"psr/log": "~1.0",
- "symfony/event-dispatcher": "~2.1",
- "symfony/process": "~2.1"
+ "symfony/event-dispatcher": "~2.1|~3.0.0",
+ "symfony/process": "~2.1|~3.0.0"
},
"suggest": {
"psr/log": "For using the console logger",
@@ -1304,241 +1360,315 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Console\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Console Component",
- "homepage": "http://symfony.com",
- "time": "2015-01-25 04:39:26"
+ "homepage": "https://symfony.com",
+ "time": "2016-03-17 09:19:04"
},
{
"name": "symfony/filesystem",
- "version": "v2.6.4",
- "target-dir": "Symfony/Component/Filesystem",
+ "version": "v2.8.4",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Filesystem.git",
- "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7"
+ "url": "https://github.com/symfony/filesystem.git",
+ "reference": "f08ffdf229252cd2745558cb2112df43903bcae4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
- "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/f08ffdf229252cd2745558cb2112df43903bcae4",
+ "reference": "f08ffdf229252cd2745558cb2112df43903bcae4",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Filesystem\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Filesystem Component",
- "homepage": "http://symfony.com",
- "time": "2015-01-03 21:13:09"
+ "homepage": "https://symfony.com",
+ "time": "2016-03-27 10:20:16"
},
{
"name": "symfony/finder",
- "version": "v2.6.4",
- "target-dir": "Symfony/Component/Finder",
+ "version": "v2.8.4",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Finder.git",
- "reference": "16513333bca64186c01609961a2bb1b95b5e1355"
+ "url": "https://github.com/symfony/finder.git",
+ "reference": "ca24cf2cd4e3826f571e0067e535758e73807aa1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Finder/zipball/16513333bca64186c01609961a2bb1b95b5e1355",
- "reference": "16513333bca64186c01609961a2bb1b95b5e1355",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/ca24cf2cd4e3826f571e0067e535758e73807aa1",
+ "reference": "ca24cf2cd4e3826f571e0067e535758e73807aa1",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Finder\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Finder Component",
- "homepage": "http://symfony.com",
- "time": "2015-01-03 08:01:59"
+ "homepage": "https://symfony.com",
+ "time": "2016-03-10 10:53:53"
+ },
+ {
+ "name": "symfony/polyfill-mbstring",
+ "version": "v1.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-mbstring.git",
+ "reference": "1289d16209491b584839022f29257ad859b8532d"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
+ "reference": "1289d16209491b584839022f29257ad859b8532d",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ext-mbstring": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Mbstring\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for the Mbstring extension",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "mbstring",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2016-01-20 09:13:37"
},
{
"name": "symfony/process",
- "version": "v2.6.4",
- "target-dir": "Symfony/Component/Process",
+ "version": "v2.8.4",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Process.git",
- "reference": "ecfc23e89d9967999fa5f60a1e9af7384396e9ae"
+ "url": "https://github.com/symfony/process.git",
+ "reference": "fb467471952ef5cf8497c029980e556b47545333"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/ecfc23e89d9967999fa5f60a1e9af7384396e9ae",
- "reference": "ecfc23e89d9967999fa5f60a1e9af7384396e9ae",
+ "url": "https://api.github.com/repos/symfony/process/zipball/fb467471952ef5cf8497c029980e556b47545333",
+ "reference": "fb467471952ef5cf8497c029980e556b47545333",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Process\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Process Component",
- "homepage": "http://symfony.com",
- "time": "2015-01-25 04:39:26"
+ "homepage": "https://symfony.com",
+ "time": "2016-03-23 13:11:46"
},
{
"name": "symfony/yaml",
- "version": "v2.6.4",
- "target-dir": "Symfony/Component/Yaml",
+ "version": "v2.8.4",
"source": {
"type": "git",
- "url": "https://github.com/symfony/Yaml.git",
- "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8"
+ "url": "https://github.com/symfony/yaml.git",
+ "reference": "584e52cb8f788a887553ba82db6caacb1d6260bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/60ed7751671113cf1ee7d7778e691642c2e9acd8",
- "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/584e52cb8f788a887553ba82db6caacb1d6260bb",
+ "reference": "584e52cb8f788a887553ba82db6caacb1d6260bb",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Yaml\\": ""
- }
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Yaml Component",
- "homepage": "http://symfony.com",
- "time": "2015-01-25 04:39:26"
+ "homepage": "https://symfony.com",
+ "time": "2016-03-04 07:54:35"
},
{
"name": "twig/twig",
- "version": "v1.18.0",
+ "version": "v1.24.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf"
+ "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf",
- "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
+ "reference": "3e5aa30ebfbafd5951fb1b01e338e1800ce7e0e8",
"shasum": ""
},
"require": {
- "php": ">=5.2.4"
+ "php": ">=5.2.7"
+ },
+ "require-dev": {
+ "symfony/debug": "~2.7",
+ "symfony/phpunit-bridge": "~2.7"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-master": "1.24-dev"
}
},
"autoload": {
@@ -1573,7 +1703,7 @@
"keywords": [
"templating"
],
- "time": "2015-01-25 17:32:08"
+ "time": "2016-01-25 21:22:18"
}
],
"aliases": [],
diff --git a/phpseclib/Crypt/AES.php b/phpseclib/Crypt/AES.php
index 2696e0ab..8521eb5e 100644
--- a/phpseclib/Crypt/AES.php
+++ b/phpseclib/Crypt/AES.php
@@ -11,13 +11,13 @@
* just a wrapper to Rijndael.php you may consider using Rijndael.php instead of
* to save one include_once().
*
- * If {@link \phpseclib\Crypt\AES::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
- * {@link \phpseclib\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 192-bits and 192 bits will be the key length until {@link \phpseclib\Crypt\AES::setKey() setKey()}
+ * If {@link self::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
+ * {@link self::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 192-bits and 192 bits will be the key length until {@link self::setKey() setKey()}
* is called, again, at which point, it'll be recalculated.
*
* Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, some functions are available to be called that, in the context of AES, don't
- * make a whole lot of sense. {@link \phpseclib\Crypt\AES::setBlockLength() setBlockLength()}, for instance. Calling that function,
+ * make a whole lot of sense. {@link self::setBlockLength() setBlockLength()}, for instance. Calling that function,
* however possible, won't do anything (AES has a fixed block length whereas Rijndael has a variable one).
*
* Here's a short example of how to use this library:
@@ -49,8 +49,6 @@
namespace phpseclib\Crypt;
-use phpseclib\Crypt\Rijndael;
-
/**
* Pure-PHP implementation of AES.
*
@@ -67,31 +65,33 @@ class AES extends Rijndael
*
* @see \phpseclib\Crypt\Rijndael::setBlockLength()
* @access public
- * @param Integer $length
+ * @param int $length
+ * @throws \BadMethodCallException anytime it's called
*/
function setBlockLength($length)
{
- return;
+ throw new \BadMethodCallException('The block length cannot be set for AES.');
}
/**
* Sets the key length
*
- * Valid key lengths are 128, 192, and 256. If the length is less than 128, it will be rounded up to
- * 128. If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
+ * Valid key lengths are 128, 192, and 256. Set the link to bool(false) to disable a fixed key length
*
* @see \phpseclib\Crypt\Rijndael:setKeyLength()
* @access public
- * @param Integer $length
+ * @param int $length
+ * @throws \LengthException if the key length isn't supported
*/
function setKeyLength($length)
{
switch ($length) {
- case 160:
- $length = 192;
+ case 128:
+ case 192:
+ case 256:
break;
- case 224:
- $length = 256;
+ default:
+ throw new \LengthException('Key of size ' . $length . ' not supported by this algorithm. Only keys of sizes 128, 192 or 256 supported');
}
parent::setKeyLength($length);
}
@@ -104,25 +104,20 @@ class AES extends Rijndael
* @see \phpseclib\Crypt\Rijndael:setKey()
* @see setKeyLength()
* @access public
- * @param String $key
+ * @param string $key
+ * @throws \LengthException if the key length isn't supported
*/
function setKey($key)
{
- parent::setKey($key);
-
- 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->_setEngine();
+ switch (strlen($key)) {
+ case 16:
+ case 24:
+ case 32:
+ break;
+ default:
+ throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported');
}
+
+ parent::setKey($key);
}
}
diff --git a/phpseclib/Crypt/Base.php b/phpseclib/Crypt/Base.php
index 715ab2a5..92a6f62b 100644
--- a/phpseclib/Crypt/Base.php
+++ b/phpseclib/Crypt/Base.php
@@ -36,8 +36,6 @@
namespace phpseclib\Crypt;
-use phpseclib\Crypt\Hash;
-
/**
* Base Class for all \phpseclib\Crypt\* cipher classes
*
@@ -94,7 +92,7 @@ abstract class Base
* Whirlpool available flag
*
* @see \phpseclib\Crypt\Base::_hashInlineCryptFunction()
- * @var Boolean
+ * @var bool
* @access private
*/
static $WHIRLPOOL_AVAILABLE;
@@ -120,8 +118,8 @@ abstract class Base
/**
* The Encryption Mode
*
- * @see \phpseclib\Crypt\Base::__construct()
- * @var Integer
+ * @see self::__construct()
+ * @var int
* @access private
*/
var $mode;
@@ -129,7 +127,7 @@ abstract class Base
/**
* The Block Length of the block cipher
*
- * @var Integer
+ * @var int
* @access private
*/
var $block_size = 16;
@@ -137,27 +135,27 @@ abstract class Base
/**
* The Key
*
- * @see \phpseclib\Crypt\Base::setKey()
- * @var String
+ * @see self::setKey()
+ * @var string
* @access private
*/
- var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+ var $key = false;
/**
* The Initialization Vector
*
- * @see \phpseclib\Crypt\Base::setIV()
- * @var String
+ * @see self::setIV()
+ * @var string
* @access private
*/
- var $iv;
+ var $iv = false;
/**
* A "sliding" Initialization Vector
*
- * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
- * @see \phpseclib\Crypt\Base::_clearBuffers()
- * @var String
+ * @see self::enableContinuousBuffer()
+ * @see self::_clearBuffers()
+ * @var string
* @access private
*/
var $encryptIV;
@@ -165,9 +163,9 @@ abstract class Base
/**
* A "sliding" Initialization Vector
*
- * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
- * @see \phpseclib\Crypt\Base::_clearBuffers()
- * @var String
+ * @see self::enableContinuousBuffer()
+ * @see self::_clearBuffers()
+ * @var string
* @access private
*/
var $decryptIV;
@@ -175,8 +173,8 @@ abstract class Base
/**
* Continuous Buffer status
*
- * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
- * @var Boolean
+ * @see self::enableContinuousBuffer()
+ * @var bool
* @access private
*/
var $continuousBuffer = false;
@@ -184,9 +182,9 @@ abstract class Base
/**
* Encryption buffer for CTR, OFB and CFB modes
*
- * @see \phpseclib\Crypt\Base::encrypt()
- * @see \phpseclib\Crypt\Base::_clearBuffers()
- * @var Array
+ * @see self::encrypt()
+ * @see self::_clearBuffers()
+ * @var array
* @access private
*/
var $enbuffer;
@@ -194,9 +192,9 @@ abstract class Base
/**
* Decryption buffer for CTR, OFB and CFB modes
*
- * @see \phpseclib\Crypt\Base::decrypt()
- * @see \phpseclib\Crypt\Base::_clearBuffers()
- * @var Array
+ * @see self::decrypt()
+ * @see self::_clearBuffers()
+ * @var array
* @access private
*/
var $debuffer;
@@ -207,8 +205,8 @@ abstract class Base
* 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 \phpseclib\Crypt\Base::encrypt()
- * @var Resource
+ * @see self::encrypt()
+ * @var resource
* @access private
*/
var $enmcrypt;
@@ -219,8 +217,8 @@ abstract class Base
* 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 \phpseclib\Crypt\Base::decrypt()
- * @var Resource
+ * @see self::decrypt()
+ * @var resource
* @access private
*/
var $demcrypt;
@@ -230,7 +228,7 @@ abstract class Base
*
* @see \phpseclib\Crypt\Twofish::setKey()
* @see \phpseclib\Crypt\Twofish::setIV()
- * @var Boolean
+ * @var bool
* @access private
*/
var $enchanged = true;
@@ -240,7 +238,7 @@ abstract class Base
*
* @see \phpseclib\Crypt\Twofish::setKey()
* @see \phpseclib\Crypt\Twofish::setIV()
- * @var Boolean
+ * @var bool
* @access private
*/
var $dechanged = true;
@@ -256,10 +254,10 @@ abstract class Base
* use a separate ECB-mode mcrypt resource.
*
* @link http://phpseclib.sourceforge.net/cfb-demo.phps
- * @see \phpseclib\Crypt\Base::encrypt()
- * @see \phpseclib\Crypt\Base::decrypt()
- * @see \phpseclib\Crypt\Base::_setupMcrypt()
- * @var Resource
+ * @see self::encrypt()
+ * @see self::decrypt()
+ * @see self::_setupMcrypt()
+ * @var resource
* @access private
*/
var $ecb;
@@ -280,8 +278,8 @@ abstract class Base
* which, typically, depends on the complexity
* on its internaly Key-expanding algorithm.
*
- * @see \phpseclib\Crypt\Base::encrypt()
- * @var Integer
+ * @see self::encrypt()
+ * @var int
* @access private
*/
var $cfb_init_len = 600;
@@ -289,10 +287,10 @@ abstract class Base
/**
* Does internal cipher state need to be (re)initialized?
*
- * @see setKey()
- * @see setIV()
- * @see disableContinuousBuffer()
- * @var Boolean
+ * @see self::setKey()
+ * @see self::setIV()
+ * @see self::disableContinuousBuffer()
+ * @var bool
* @access private
*/
var $changed = true;
@@ -300,8 +298,8 @@ abstract class Base
/**
* Padding status
*
- * @see \phpseclib\Crypt\Base::enablePadding()
- * @var Boolean
+ * @see self::enablePadding()
+ * @var bool
* @access private
*/
var $padding = true;
@@ -309,8 +307,8 @@ abstract class Base
/**
* Is the mode one that is paddable?
*
- * @see \phpseclib\Crypt\Base::__construct()
- * @var Boolean
+ * @see self::__construct()
+ * @var bool
* @access private
*/
var $paddable = false;
@@ -324,10 +322,10 @@ abstract class Base
* - self::ENGINE_MCRYPT (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
* - self::ENGINE_INTERNAL (slower, pure php-engine, no php-extension required)
*
- * @see \phpseclib\Crypt\Base::_setEngine()
- * @see \phpseclib\Crypt\Base::encrypt()
- * @see \phpseclib\Crypt\Base::decrypt()
- * @var Integer
+ * @see self::_setEngine()
+ * @see self::encrypt()
+ * @see self::decrypt()
+ * @var int
* @access private
*/
var $engine;
@@ -335,9 +333,9 @@ abstract class Base
/**
* Holds the preferred crypt engine
*
- * @see \phpseclib\Crypt\Base::_setEngine()
- * @see \phpseclib\Crypt\Base::setPreferredEngine()
- * @var Integer
+ * @see self::_setEngine()
+ * @see self::setPreferredEngine()
+ * @var int
* @access private
*/
var $preferredEngine;
@@ -349,8 +347,8 @@ abstract class Base
*
* @link http://www.php.net/mcrypt_module_open
* @link http://www.php.net/mcrypt_list_algorithms
- * @see \phpseclib\Crypt\Base::_setupMcrypt()
- * @var String
+ * @see self::_setupMcrypt()
+ * @var string
* @access private
*/
var $cipher_name_mcrypt;
@@ -358,10 +356,10 @@ abstract class Base
/**
* The openssl specific name of the cipher
*
- * Only used if $engine == CRYPT_ENGINE_OPENSSL
+ * Only used if $engine == self::ENGINE_OPENSSL
*
* @link http://www.php.net/openssl-get-cipher-methods
- * @var String
+ * @var string
* @access private
*/
var $cipher_name_openssl;
@@ -373,25 +371,16 @@ abstract class Base
* it can still be emulated with ECB mode.
*
* @link http://www.php.net/openssl-get-cipher-methods
- * @var String
+ * @var string
* @access private
*/
var $cipher_name_openssl_ecb;
- /**
- * The default password key_size used by setPassword()
- *
- * @see \phpseclib\Crypt\Base::setPassword()
- * @var Integer
- * @access private
- */
- var $password_key_size = 32;
-
/**
* The default salt used by setPassword()
*
- * @see \phpseclib\Crypt\Base::setPassword()
- * @var String
+ * @see self::setPassword()
+ * @var string
* @access private
*/
var $password_default_salt = 'phpseclib/salt';
@@ -402,10 +391,10 @@ abstract class Base
* Used by encrypt() / decrypt()
* only if $engine == self::ENGINE_INTERNAL
*
- * @see \phpseclib\Crypt\Base::encrypt()
- * @see \phpseclib\Crypt\Base::decrypt()
- * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
- * @see \phpseclib\Crypt\Base::$use_inline_crypt
+ * @see self::encrypt()
+ * @see self::decrypt()
+ * @see self::_setupInlineCrypt()
+ * @see self::$use_inline_crypt
* @var Callback
* @access private
*/
@@ -414,9 +403,9 @@ abstract class Base
/**
* Holds whether performance-optimized $inline_crypt() can/should be used.
*
- * @see \phpseclib\Crypt\Base::encrypt()
- * @see \phpseclib\Crypt\Base::decrypt()
- * @see \phpseclib\Crypt\Base::inline_crypt
+ * @see self::encrypt()
+ * @see self::decrypt()
+ * @see self::inline_crypt
* @var mixed
* @access private
*/
@@ -425,8 +414,8 @@ abstract class Base
/**
* If OpenSSL can be used in ECB but not in CTR we can emulate CTR
*
- * @see \phpseclib\Crypt\Base::_openssl_ctr_process()
- * @var Boolean
+ * @see self::_openssl_ctr_process()
+ * @var bool
* @access private
*/
var $openssl_emulate_ctr = false;
@@ -434,16 +423,32 @@ abstract class Base
/**
* Determines what options are passed to openssl_encrypt/decrypt
*
- * @see \phpseclib\Crypt\Base::isValidEngine()
+ * @see self::isValidEngine()
* @var mixed
* @access private
*/
var $openssl_options;
/**
- * Default Constructor.
+ * Don't truncate / null pad key
*
- * Determines whether or not the mcrypt extension should be used.
+ * @see self::_clearBuffers()
+ * @var bool
+ * @access private
+ */
+ var $skip_key_adjustment = false;
+
+ /**
+ * Has the key length explicitly been set or should it be derived from the key, itself?
+ *
+ * @see self::setKeyLength()
+ * @var bool
+ * @access private
+ */
+ var $explicit_key_length = false;
+
+ /**
+ * Default Constructor.
*
* $mode could be:
*
@@ -457,34 +462,29 @@ abstract class Base
*
* - self::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, self::MODE_CBC will be used.
- *
- * @param optional Integer $mode
+ * @param int $mode
* @access public
+ * @throws \InvalidArgumentException if an invalid / unsupported mode is provided
*/
- function __construct($mode = self::MODE_CBC)
+ function __construct($mode)
{
// $mode dependent settings
switch ($mode) {
case self::MODE_ECB:
+ case self::MODE_CBC:
$this->paddable = true;
- $this->mode = self::MODE_ECB;
break;
case self::MODE_CTR:
case self::MODE_CFB:
case self::MODE_OFB:
case self::MODE_STREAM:
- $this->mode = $mode;
+ $this->paddable = false;
break;
- case self::MODE_CBC:
default:
- $this->paddable = true;
- $this->mode = self::MODE_CBC;
+ throw new \InvalidArgumentException('No valid mode has been specified');
}
- $this->_setEngine();
+ $this->mode = $mode;
// Determining whether inline crypting can be used by the cipher
if ($this->use_inline_crypt !== false && function_exists('create_function')) {
@@ -493,25 +493,85 @@ abstract class Base
}
/**
- * Sets the initialization vector. (optional)
+ * Sets the initialization vector.
*
- * SetIV is not required when self::MODE_ECB (or ie for AES: \phpseclib\Crypt\AES::MODE_ECB) is being used. If not explicitly set, it'll be assumed
- * to be all zero's.
+ * setIV() is not required when self::MODE_ECB (or ie for AES: \phpseclib\Crypt\AES::MODE_ECB) is being used.
*
* @access public
- * @param String $iv
+ * @param string $iv
+ * @throws \LengthException if the IV length isn't equal to the block size
+ * @throws \InvalidArgumentException if an IV is provided when one shouldn't be
* @internal Can be overwritten by a sub class, but does not have to be
*/
function setIV($iv)
{
if ($this->mode == self::MODE_ECB) {
- return;
+ throw new \InvalidArgumentException('This mode does not require an IV.');
+ }
+
+ if ($this->mode == self::MODE_STREAM && $this->usesIV()) {
+ throw new \InvalidArgumentException('This algorithm does not use an IV.');
+ }
+
+ if (strlen($iv) != $this->block_size) {
+ throw new \LengthException('Received initialization vector of size ' . strlen($iv) . ', but size ' . $this->block_size . ' is required');
}
$this->iv = $iv;
$this->changed = true;
}
+ /**
+ * Returns whether or not the algorithm uses an IV
+ *
+ * @access public
+ * @return bool
+ */
+ function usesIV()
+ {
+ return true;
+ }
+
+ /**
+ * Returns the current key length in bits
+ *
+ * @access public
+ * @return int
+ */
+ function getKeyLength()
+ {
+ return $this->key_length << 3;
+ }
+
+ /**
+ * Returns the current block length in bits
+ *
+ * @access public
+ * @return int
+ */
+ function getBlockLength()
+ {
+ return $this->block_size << 3;
+ }
+
+ /**
+ * Sets the key length.
+ *
+ * Keys with explicitly set lengths need to be treated accordingly
+ *
+ * @access public
+ * @param int $length
+ */
+ function setKeyLength($length)
+ {
+ $this->explicit_key_length = $length >> 3;
+
+ if (is_string($this->key) && strlen($this->key) != $this->explicit_key_length) {
+ $this->key = false;
+ throw new \LengthException('Key has already been set and is not ' .$this->explicit_key_length . ' bytes long');
+ }
+ }
+
/**
* Sets the key.
*
@@ -523,12 +583,17 @@ abstract class Base
* If the key is not explicitly set, it'll be assumed to be all null bytes.
*
* @access public
- * @param String $key
+ * @param string $key
* @internal Could, but not must, extend by the child Crypt_* class
*/
function setKey($key)
{
+ if ($this->explicit_key_length !== false && strlen($key) != $this->explicit_key_length) {
+ throw new \LengthException('Key length has already been set to ' . $this->explicit_key_length . ' bytes and this key is ' . strlen($key) . ' bytes');
+ }
+
$this->key = $key;
+ $this->key_length = strlen($key);
$this->changed = true;
$this->_setEngine();
}
@@ -543,9 +608,10 @@ abstract class Base
* Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
*
* @see Crypt/Hash.php
- * @param String $password
- * @param optional String $method
- * @return Boolean
+ * @param string $password
+ * @param string $method
+ * @throws \LengthException if pbkdf1 is being used and the derived key length exceeds the hash length
+ * @return bool
* @access public
* @internal Could, but not must, extend by the child Crypt_* class
*/
@@ -571,7 +637,8 @@ abstract class Base
if (isset($func_args[5])) {
$dkLen = $func_args[5];
} else {
- $dkLen = $method == 'pbkdf1' ? 2 * $this->password_key_size : $this->password_key_size;
+ $key_length = $this->explicit_key_length !== false ? $this->explicit_key_length : $this->key_length;
+ $dkLen = $method == 'pbkdf1' ? 2 * $key_length : $key_length;
}
switch (true) {
@@ -579,8 +646,7 @@ abstract class Base
$hashObj = new Hash();
$hashObj->setHash($hash);
if ($dkLen > $hashObj->getLength()) {
- user_error('Derived key too long');
- return false;
+ throw new \LengthException('Derived key length cannot be longer than the hash length');
}
$t = $password . $salt;
for ($i = 0; $i < $count; ++$i) {
@@ -634,10 +700,10 @@ abstract class Base
* strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
* length.
*
- * @see \phpseclib\Crypt\Base::decrypt()
+ * @see self::decrypt()
* @access public
- * @param String $plaintext
- * @return String $ciphertext
+ * @param string $plaintext
+ * @return string $ciphertext
* @internal Could, but not must, extend by the child Crypt_* class
*/
function encrypt($plaintext)
@@ -659,10 +725,13 @@ abstract class Base
return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
case self::MODE_CBC:
$result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->encryptIV);
+ if (!defined('OPENSSL_RAW_DATA')) {
+ $result = substr($result, 0, -$this->block_size);
+ }
if ($this->continuousBuffer) {
$this->encryptIV = substr($result, -$this->block_size);
}
- return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
+ return $result;
case self::MODE_CTR:
return $this->_openssl_ctr_process($plaintext, $this->encryptIV, $this->enbuffer);
case self::MODE_CFB:
@@ -724,7 +793,7 @@ abstract class Base
$this->changed = false;
}
if ($this->enchanged) {
- mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
+ mcrypt_generic_init($this->enmcrypt, $this->key, $this->_getIV($this->encryptIV));
$this->enchanged = false;
}
@@ -787,7 +856,7 @@ abstract class Base
$ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
if (!$this->continuousBuffer) {
- mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
+ mcrypt_generic_init($this->enmcrypt, $this->key, $this->_getIV($this->encryptIV));
}
return $ciphertext;
@@ -914,7 +983,7 @@ abstract class Base
if ($this->continuousBuffer) {
$this->encryptIV = $xor;
if ($start = strlen($plaintext) % $block_size) {
- $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+ $buffer['xor'] = substr($key, $start) . $buffer['xor'];
}
}
break;
@@ -932,18 +1001,17 @@ abstract class Base
* 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 \phpseclib\Crypt\Base::encrypt()
+ * @see self::encrypt()
* @access public
- * @param String $ciphertext
- * @return String $plaintext
+ * @param string $ciphertext
+ * @return string $plaintext
+ * @throws \LengthException if we're inside a block cipher and the ciphertext length is not a multiple of the block size
* @internal Could, but not must, extend by the child Crypt_* class
*/
function decrypt($ciphertext)
{
- 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) + ($this->block_size - strlen($ciphertext) % $this->block_size) % $this->block_size, chr(0));
+ if ($this->paddable && strlen($ciphertext) % $this->block_size) {
+ throw new \LengthException('The ciphertext length (' . strlen($ciphertext) . ') needs to be a multiple of the block size (' . $this->block_size . ')');
}
if ($this->engine === self::ENGINE_OPENSSL) {
@@ -957,7 +1025,7 @@ abstract class Base
break;
case self::MODE_ECB:
if (!defined('OPENSSL_RAW_DATA')) {
- $ciphetext.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $this->key, true);
+ $ciphertext.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $this->key, true);
}
$plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
break;
@@ -965,10 +1033,13 @@ abstract class Base
if (!defined('OPENSSL_RAW_DATA')) {
$padding = str_repeat(chr($this->block_size), $this->block_size) ^ substr($ciphertext, -$this->block_size);
$ciphertext.= substr(openssl_encrypt($padding, $this->cipher_name_openssl_ecb, $this->key, true), 0, $this->block_size);
+ $offset = 2 * $this->block_size;
+ } else {
+ $offset = $this->block_size;
}
$plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->decryptIV);
if ($this->continuousBuffer) {
- $this->decryptIV = substr($ciphertext, -$this->block_size);
+ $this->decryptIV = substr($ciphertext, -$offset, $this->block_size);
}
break;
case self::MODE_CTR:
@@ -1033,7 +1104,7 @@ abstract class Base
$this->changed = false;
}
if ($this->dechanged) {
- mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
+ mcrypt_generic_init($this->demcrypt, $this->key, $this->_getIV($this->decryptIV));
$this->dechanged = false;
}
@@ -1078,7 +1149,7 @@ abstract class Base
$plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
if (!$this->continuousBuffer) {
- mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
+ mcrypt_generic_init($this->demcrypt, $this->key, $this->_getIV($this->decryptIV));
}
return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
@@ -1204,7 +1275,7 @@ abstract class Base
if ($this->continuousBuffer) {
$this->decryptIV = $xor;
if ($start = strlen($ciphertext) % $block_size) {
- $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+ $buffer['xor'] = substr($key, $start) . $buffer['xor'];
}
}
break;
@@ -1215,20 +1286,36 @@ abstract class Base
return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
}
+ /**
+ * Get the IV
+ *
+ * mcrypt requires an IV even if ECB is used
+ *
+ * @see self::encrypt()
+ * @see self::decrypt()
+ * @param string $iv
+ * @return string
+ * @access private
+ */
+ function _getIV($iv)
+ {
+ return $this->mode == self::MODE_ECB ? str_repeat("\0", $this->block_size) : $iv;
+ }
+
/**
* OpenSSL CTR Processor
*
* PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
- * for CTR is the same for both encrypting and decrypting this function is re-used by both Crypt_Base::encrypt()
- * and Crypt_Base::decrypt(). Also, OpenSSL doesn't implement CTR for all of it's symmetric ciphers so this
+ * for CTR is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
+ * and Base::decrypt(). Also, OpenSSL doesn't implement CTR for all of it's symmetric ciphers so this
* function will emulate CTR with ECB when necesary.
*
- * @see Crypt_Base::encrypt()
- * @see Crypt_Base::decrypt()
- * @param String $plaintext
- * @param String $encryptIV
- * @param Array $buffer
- * @return String
+ * @see self::encrypt()
+ * @see self::decrypt()
+ * @param string $plaintext
+ * @param string $encryptIV
+ * @param array $buffer
+ * @return string
* @access private
*/
function _openssl_ctr_process($plaintext, &$encryptIV, &$buffer)
@@ -1314,15 +1401,15 @@ abstract class Base
* OpenSSL OFB Processor
*
* PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
- * for OFB is the same for both encrypting and decrypting this function is re-used by both Crypt_Base::encrypt()
- * and Crypt_Base::decrypt().
+ * for OFB is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
+ * and Base::decrypt().
*
- * @see Crypt_Base::encrypt()
- * @see Crypt_Base::decrypt()
- * @param String $plaintext
- * @param String $encryptIV
- * @param Array $buffer
- * @return String
+ * @see self::encrypt()
+ * @see self::decrypt()
+ * @param string $plaintext
+ * @param string $encryptIV
+ * @param array $buffer
+ * @return string
* @access private
*/
function _openssl_ofb_process($plaintext, &$encryptIV, &$buffer)
@@ -1368,7 +1455,7 @@ abstract class Base
*
* May need to be overwritten by classes extending this one in some cases
*
- * @return Integer
+ * @return int
* @access private
*/
function _openssl_translate_mode()
@@ -1399,7 +1486,7 @@ abstract class Base
* away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
* transmitted separately)
*
- * @see \phpseclib\Crypt\Base::disablePadding()
+ * @see self::disablePadding()
* @access public
*/
function enablePadding()
@@ -1410,7 +1497,7 @@ abstract class Base
/**
* Do not pad packets.
*
- * @see \phpseclib\Crypt\Base::enablePadding()
+ * @see self::enablePadding()
* @access public
*/
function disablePadding()
@@ -1452,7 +1539,7 @@ abstract class Base
* 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 \phpseclib\Crypt\Base::disableContinuousBuffer()
+ * @see self::disableContinuousBuffer()
* @access public
* @internal Could, but not must, extend by the child Crypt_* class
*/
@@ -1472,7 +1559,7 @@ abstract class Base
*
* The default behavior.
*
- * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
+ * @see self::enableContinuousBuffer()
* @access public
* @internal Could, but not must, extend by the child Crypt_* class
*/
@@ -1494,10 +1581,10 @@ abstract class Base
/**
* Test for engine validity
*
- * @see \phpseclib\Crypt\Base::Crypt_Base()
- * @param Integer $engine
+ * @see self::__construct()
+ * @param int $engine
* @access public
- * @return Boolean
+ * @return bool
*/
function isValidEngine($engine)
{
@@ -1561,8 +1648,8 @@ abstract class Base
*
* If the preferred crypt engine is not available the fastest available one will be used
*
- * @see \phpseclib\Crypt\Base::Crypt_Base()
- * @param Integer $engine
+ * @see self::__construct()
+ * @param int $engine
* @access public
*/
function setPreferredEngine($engine)
@@ -1583,7 +1670,7 @@ abstract class Base
/**
* Returns the engine currently being utilized
*
- * @see \phpseclib\Crypt\Base::_setEngine()
+ * @see self::_setEngine()
* @access public
*/
function getEngine()
@@ -1594,7 +1681,7 @@ abstract class Base
/**
* Sets the engine as appropriate
*
- * @see \phpseclib\Crypt\Base::Crypt_Base()
+ * @see self::__construct()
* @access private
*/
function _setEngine()
@@ -1639,8 +1726,8 @@ abstract class Base
* Note: Must be extended by the child \phpseclib\Crypt\* class
*
* @access private
- * @param String $in
- * @return String
+ * @param string $in
+ * @return string
*/
abstract function _encryptBlock($in);
@@ -1650,8 +1737,8 @@ abstract class Base
* Note: Must be extended by the child \phpseclib\Crypt\* class
*
* @access private
- * @param String $in
- * @return String
+ * @param string $in
+ * @return string
*/
abstract function _decryptBlock($in);
@@ -1662,7 +1749,7 @@ abstract class Base
*
* Note: Must extend by the child \phpseclib\Crypt\* class
*
- * @see \phpseclib\Crypt\Base::_setup()
+ * @see self::_setup()
* @access private
*/
abstract function _setupKey();
@@ -1684,9 +1771,9 @@ abstract class Base
*
* - First run of encrypt() / decrypt() with no init-settings
*
- * @see setKey()
- * @see setIV()
- * @see disableContinuousBuffer()
+ * @see self::setKey()
+ * @see self::setIV()
+ * @see self::disableContinuousBuffer()
* @access private
* @internal _setup() is always called before en/decryption.
* @internal Could, but not must, extend by the child Crypt_* class
@@ -1718,9 +1805,9 @@ abstract class Base
*
* - First run of encrypt() / decrypt()
*
- * @see setKey()
- * @see setIV()
- * @see disableContinuousBuffer()
+ * @see self::setKey()
+ * @see self::setIV()
+ * @see self::disableContinuousBuffer()
* @access private
* @internal Could, but not must, extend by the child Crypt_* class
*/
@@ -1748,7 +1835,6 @@ abstract class Base
if ($this->mode == self::MODE_CFB) {
$this->ecb = mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
}
-
} // else should mcrypt_generic_deinit be called?
if ($this->mode == self::MODE_CFB) {
@@ -1766,10 +1852,11 @@ abstract class Base
* 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 \phpseclib\Crypt\Base::_unpad()
- * @param String $text
+ * @see self::_unpad()
+ * @param string $text
+ * @throws \LengthException if padding is disabled and the plaintext's length is not a multiple of the block size
* @access private
- * @return String
+ * @return string
*/
function _pad($text)
{
@@ -1779,8 +1866,7 @@ abstract class Base
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;
+ throw new \LengthException("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size}). Try enabling padding.");
}
}
@@ -1795,10 +1881,11 @@ abstract class Base
* 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 \phpseclib\Crypt\Base::_pad()
- * @param String $text
+ * @see self::_pad()
+ * @param string $text
+ * @throws \LengthException if the ciphertext's length is not a multiple of the block size
* @access private
- * @return String
+ * @return string
*/
function _unpad($text)
{
@@ -1809,7 +1896,7 @@ abstract class Base
$length = ord($text[strlen($text) - 1]);
if (!$length || $length > $this->block_size) {
- return false;
+ throw new \LengthException("The ciphertext has an invalid padding length ($length) compared to the block size ({$this->block_size})");
}
return substr($text, 0, -$length);
@@ -1822,16 +1909,19 @@ abstract class Base
* after disableContinuousBuffer() or on cipher $engine (re)init
* ie after setKey() or setIV()
*
- * @access public
+ * @access private
* @internal Could, but not must, extend by the child Crypt_* class
+ * @throws \UnexpectedValueException when an IV is required but not defined
*/
function _clearBuffers()
{
$this->enbuffer = $this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0, 'enmcrypt_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");
+ if ($this->iv === false && !in_array($this->mode, array(self::MODE_STREAM, self::MODE_ECB))) {
+ throw new \UnexpectedValueException('No IV has been defined');
+ }
+
+ $this->encryptIV = $this->decryptIV = $this->iv;
}
/**
@@ -1839,10 +1929,10 @@ abstract class Base
*
* Inspired by array_shift
*
- * @param String $string
- * @param optional Integer $index
+ * @param string $string
+ * @param int $index
* @access private
- * @return String
+ * @return string
*/
function _string_shift(&$string, $index = 1)
{
@@ -1856,10 +1946,10 @@ abstract class Base
*
* Inspired by array_pop
*
- * @param String $string
- * @param optional Integer $index
+ * @param string $string
+ * @param int $index
* @access private
- * @return String
+ * @return string
*/
function _string_pop(&$string, $index = 1)
{
@@ -1871,9 +1961,9 @@ abstract class Base
/**
* Increment the current string
*
- * @see \phpseclib\Crypt\Base::decrypt()
- * @see \phpseclib\Crypt\Base::encrypt()
- * @param String $var
+ * @see self::decrypt()
+ * @see self::encrypt()
+ * @param string $var
* @access private
*/
function _increment_str(&$var)
@@ -1958,10 +2048,10 @@ abstract class Base
* - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
*
*
- * @see \phpseclib\Crypt\Base::_setup()
- * @see \phpseclib\Crypt\Base::_createInlineCryptFunction()
- * @see \phpseclib\Crypt\Base::encrypt()
- * @see \phpseclib\Crypt\Base::decrypt()
+ * @see self::_setup()
+ * @see self::_createInlineCryptFunction()
+ * @see self::encrypt()
+ * @see self::decrypt()
* @access private
* @internal If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()
*/
@@ -2080,12 +2170,12 @@ abstract class Base
* );
*
*
- * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
- * @see \phpseclib\Crypt\Base::encrypt()
- * @see \phpseclib\Crypt\Base::decrypt()
- * @param Array $cipher_code
+ * @see self::_setupInlineCrypt()
+ * @see self::encrypt()
+ * @see self::decrypt()
+ * @param array $cipher_code
* @access private
- * @return String (the name of the created callback function)
+ * @return string (the name of the created callback function)
*/
function _createInlineCryptFunction($cipher_code)
{
@@ -2452,7 +2542,7 @@ abstract class Base
* for which $mode the lambda function was created.
*
* @access private
- * @return Array &$functions
+ * @return array &$functions
*/
function &_getLambdaFunctions()
{
@@ -2463,10 +2553,10 @@ abstract class Base
/**
* Generates a digest from $bytes
*
- * @see _setupInlineCrypt()
+ * @see self::_setupInlineCrypt()
* @access private
* @param $bytes
- * @return String
+ * @return string
*/
function _hashInlineCryptFunction($bytes)
{
diff --git a/phpseclib/Crypt/Blowfish.php b/phpseclib/Crypt/Blowfish.php
index 9844bafa..3500df59 100644
--- a/phpseclib/Crypt/Blowfish.php
+++ b/phpseclib/Crypt/Blowfish.php
@@ -37,8 +37,6 @@
namespace phpseclib\Crypt;
-use phpseclib\Crypt\Base;
-
/**
* Pure-PHP implementation of Blowfish.
*
@@ -53,26 +51,16 @@ class Blowfish extends Base
* Block Length of the cipher
*
* @see \phpseclib\Crypt\Base::block_size
- * @var Integer
+ * @var int
* @access private
*/
var $block_size = 8;
- /**
- * The default password key_size used by setPassword()
- *
- * @see \phpseclib\Crypt\Base::password_key_size
- * @see \phpseclib\Crypt\Base::setPassword()
- * @var Integer
- * @access private
- */
- var $password_key_size = 56;
-
/**
* The mcrypt specific name of the cipher
*
* @see \phpseclib\Crypt\Base::cipher_name_mcrypt
- * @var String
+ * @var string
* @access private
*/
var $cipher_name_mcrypt = 'blowfish';
@@ -81,7 +69,7 @@ class Blowfish extends Base
* Optimizing value while CFB-encrypting
*
* @see \phpseclib\Crypt\Base::cfb_init_len
- * @var Integer
+ * @var int
* @access private
*/
var $cfb_init_len = 500;
@@ -94,7 +82,7 @@ class Blowfish extends Base
* @access private
* @var array
*/
- var $sbox0 = 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,
@@ -277,53 +265,73 @@ class Blowfish extends Base
/**
* Holds the last used key
*
- * @var Array
+ * @var array
* @access private
*/
var $kl;
/**
- * Sets the key.
+ * The Key Length (in bytes)
*
- * 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 \phpseclib\Crypt\Base::setKey()
- * @param String $key
+ * @see \phpseclib\Crypt\Base::setKeyLength()
+ * @var int
+ * @access private
+ * @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_length. We could
+ * derive this from $key_length 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.
*/
- function setKey($key)
- {
- $keylength = strlen($key);
+ var $key_length = 16;
- 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);
+ /**
+ * Default Constructor.
+ *
+ * @param int $mode
+ * @access public
+ * @throws \InvalidArgumentException if an invalid / unsupported mode is provided
+ */
+ function __construct($mode)
+ {
+ if ($mode == self::MODE_STREAM) {
+ throw new \InvalidArgumentException('Block ciphers cannot be ran in stream mode');
}
- parent::setKey($key);
+ parent::__construct($mode);
+ }
+
+ /**
+ * Sets the key length.
+ *
+ * Key lengths can be between 32 and 448 bits.
+ *
+ * @access public
+ * @param int $length
+ */
+ function setKeyLength($length)
+ {
+ if ($length < 32 || $length > 448) {
+ throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes between 32 and 448 bits are supported');
+ }
+
+ $this->key_length = $length >> 3;
+
+ parent::setKeyLength($length);
}
/**
* Test for engine validity
*
- * This is mainly just a wrapper to set things up for Crypt_Base::isValidEngine()
+ * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
*
* @see \phpseclib\Crypt\Base::isValidEngine()
- * @param Integer $engine
+ * @param int $engine
* @access public
- * @return Boolean
+ * @return bool
*/
function isValidEngine($engine)
{
if ($engine == self::ENGINE_OPENSSL) {
- if (strlen($this->key) != 16) {
+ if ($this->key_length != 16) {
return false;
}
$this->cipher_name_openssl_ecb = 'bf-ecb';
@@ -393,8 +401,8 @@ class Blowfish extends Base
* Encrypts a block
*
* @access private
- * @param String $in
- * @return String
+ * @param string $in
+ * @return string
*/
function _encryptBlock($in)
{
@@ -429,8 +437,8 @@ class Blowfish extends Base
* Decrypts a block
*
* @access private
- * @param String $in
- * @return String
+ * @param string $in
+ * @return string
*/
function _decryptBlock($in)
{
@@ -471,9 +479,9 @@ class Blowfish extends Base
$lambda_functions =& self::_getLambdaFunctions();
// We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
- // (Currently, for Crypt_Blowfish, one generated $lambda_function cost on php5.5@32bit ~100kb unfreeable mem and ~180kb on php5.5@64bit)
+ // (Currently, for Blowfish, one generated $lambda_function cost on php5.5@32bit ~100kb unfreeable mem and ~180kb on php5.5@64bit)
// 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 );
+ $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
// Generation of a unique hash for our generated code
$code_hash = "Crypt_Blowfish, {$this->mode}";
diff --git a/phpseclib/Crypt/DES.php b/phpseclib/Crypt/DES.php
index d748f1a5..14273d28 100644
--- a/phpseclib/Crypt/DES.php
+++ b/phpseclib/Crypt/DES.php
@@ -42,8 +42,6 @@
namespace phpseclib\Crypt;
-use phpseclib\Crypt\Base;
-
/**
* Pure-PHP implementation of DES.
*
@@ -64,7 +62,7 @@ class DES extends Base
const ENCRYPT = 0;
/**
* Contains $keys[self::DECRYPT]
- */
+ */
const DECRYPT = 1;
/**#@-*/
@@ -72,36 +70,25 @@ class DES extends Base
* Block Length of the cipher
*
* @see \phpseclib\Crypt\Base::block_size
- * @var Integer
+ * @var int
* @access private
*/
var $block_size = 8;
/**
- * The Key
+ * Key Length (in bytes)
*
- * @see \phpseclib\Crypt\Base::key
- * @see setKey()
- * @var String
+ * @see \phpseclib\Crypt\Base::setKeyLength()
+ * @var int
* @access private
*/
- var $key = "\0\0\0\0\0\0\0\0";
-
- /**
- * The default password key_size used by setPassword()
- *
- * @see \phpseclib\Crypt\Base::password_key_size
- * @see \phpseclib\Crypt\Base::setPassword()
- * @var Integer
- * @access private
- */
- var $password_key_size = 8;
+ var $key_length = 8;
/**
* The mcrypt specific name of the cipher
*
* @see \phpseclib\Crypt\Base::cipher_name_mcrypt
- * @var String
+ * @var string
* @access private
*/
var $cipher_name_mcrypt = 'des';
@@ -110,7 +97,7 @@ class DES extends Base
* The OpenSSL names of the cipher / modes
*
* @see \phpseclib\Crypt\Base::openssl_mode_names
- * @var Array
+ * @var array
* @access private
*/
var $openssl_mode_names = array(
@@ -125,7 +112,7 @@ class DES extends Base
* Optimizing value while CFB-encrypting
*
* @see \phpseclib\Crypt\Base::cfb_init_len
- * @var Integer
+ * @var int
* @access private
*/
var $cfb_init_len = 500;
@@ -135,9 +122,9 @@ class DES extends Base
*
* Used only if $engine == self::ENGINE_INTERNAL
*
- * @see \phpseclib\Crypt\DES::_setupKey()
- * @see \phpseclib\Crypt\DES::_processBlock()
- * @var Integer
+ * @see self::_setupKey()
+ * @see self::_processBlock()
+ * @var int
* @access private
*/
var $des_rounds = 1;
@@ -145,17 +132,17 @@ class DES extends Base
/**
* max possible size of $key
*
- * @see \phpseclib\Crypt\DES::setKey()
- * @var String
+ * @see self::setKey()
+ * @var string
* @access private
*/
- var $key_size_max = 8;
+ var $key_length_max = 8;
/**
* The Key Schedule
*
- * @see \phpseclib\Crypt\DES::_setupKey()
- * @var Array
+ * @see self::_setupKey()
+ * @var array
* @access private
*/
var $keys;
@@ -167,9 +154,9 @@ class DES extends Base
* with each byte containing all bits in the same state as the
* corresponding bit in the index value.
*
- * @see \phpseclib\Crypt\DES::_processBlock()
- * @see \phpseclib\Crypt\DES::_setupKey()
- * @var Array
+ * @see self::_processBlock()
+ * @see self::_setupKey()
+ * @var array
* @access private
*/
var $shuffle = array(
@@ -308,7 +295,7 @@ class DES extends Base
*
* Indexing this table with each source byte performs the initial bit permutation.
*
- * @var Array
+ * @var array
* @access private
*/
var $ipmap = array(
@@ -350,7 +337,7 @@ class DES extends Base
* Inverse IP mapping helper table.
* Indexing this table with a byte value reverses the bit order.
*
- * @var Array
+ * @var array
* @access private
*/
var $invipmap = array(
@@ -394,7 +381,7 @@ class DES extends Base
* Each box ($sbox1-$sbox8) has been vectorized, then each value pre-permuted using the
* P table: concatenation can then be replaced by exclusive ORs.
*
- * @var Array
+ * @var array
* @access private
*/
var $sbox1 = array(
@@ -419,7 +406,7 @@ class DES extends Base
/**
* Pre-permuted S-box2
*
- * @var Array
+ * @var array
* @access private
*/
var $sbox2 = array(
@@ -444,7 +431,7 @@ class DES extends Base
/**
* Pre-permuted S-box3
*
- * @var Array
+ * @var array
* @access private
*/
var $sbox3 = array(
@@ -469,7 +456,7 @@ class DES extends Base
/**
* Pre-permuted S-box4
*
- * @var Array
+ * @var array
* @access private
*/
var $sbox4 = array(
@@ -494,7 +481,7 @@ class DES extends Base
/**
* Pre-permuted S-box5
*
- * @var Array
+ * @var array
* @access private
*/
var $sbox5 = array(
@@ -519,7 +506,7 @@ class DES extends Base
/**
* Pre-permuted S-box6
*
- * @var Array
+ * @var array
* @access private
*/
var $sbox6 = array(
@@ -544,7 +531,7 @@ class DES extends Base
/**
* Pre-permuted S-box7
*
- * @var Array
+ * @var array
* @access private
*/
var $sbox7 = array(
@@ -569,7 +556,7 @@ class DES extends Base
/**
* Pre-permuted S-box8
*
- * @var Array
+ * @var array
* @access private
*/
var $sbox8 = array(
@@ -591,19 +578,35 @@ class DES extends Base
0x00000820, 0x00020020, 0x08000000, 0x08020800
);
+ /**
+ * Default Constructor.
+ *
+ * @param int $mode
+ * @access public
+ * @throws \InvalidArgumentException if an invalid / unsupported mode is provided
+ */
+ function __construct($mode)
+ {
+ if ($mode == self::MODE_STREAM) {
+ throw new \InvalidArgumentException('Block ciphers cannot be ran in stream mode');
+ }
+
+ parent::__construct($mode);
+ }
+
/**
* Test for engine validity
*
- * This is mainly just a wrapper to set things up for Crypt_Base::isValidEngine()
+ * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
*
* @see \phpseclib\Crypt\Base::isValidEngine()
- * @param Integer $engine
+ * @param int $engine
* @access public
- * @return Boolean
+ * @return bool
*/
function isValidEngine($engine)
{
- if ($this->key_size_max == 8) {
+ if ($this->key_length_max == 8) {
if ($engine == self::ENGINE_OPENSSL) {
$this->cipher_name_openssl_ecb = 'des-ecb';
$this->cipher_name_openssl = 'des-' . $this->_openssl_translate_mode();
@@ -616,24 +619,18 @@ class DES extends Base
/**
* 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.
+ * Keys must be 64-bits long or 8 bytes 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.
- *
* @see \phpseclib\Crypt\Base::setKey()
* @access public
- * @param String $key
+ * @param string $key
*/
function setKey($key)
{
- // 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);
+ if (!($this instanceof TripleDES) && strlen($key) != 8) {
+ throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of size 8 are supported');
}
// Sets the key
@@ -645,10 +642,10 @@ class DES extends Base
*
* @see \phpseclib\Crypt\Base::_encryptBlock()
* @see \phpseclib\Crypt\Base::encrypt()
- * @see \phpseclib\Crypt\DES::encrypt()
+ * @see self::encrypt()
* @access private
- * @param String $in
- * @return String
+ * @param string $in
+ * @return string
*/
function _encryptBlock($in)
{
@@ -660,10 +657,10 @@ class DES extends Base
*
* @see \phpseclib\Crypt\Base::_decryptBlock()
* @see \phpseclib\Crypt\Base::decrypt()
- * @see \phpseclib\Crypt\DES::decrypt()
+ * @see self::decrypt()
* @access private
- * @param String $in
- * @return String
+ * @param string $in
+ * @return string
*/
function _decryptBlock($in)
{
@@ -677,12 +674,12 @@ class DES extends Base
* {@link http://en.wikipedia.org/wiki/Image:Feistel.png Feistel.png} to get a general
* idea of what this function does.
*
- * @see \phpseclib\Crypt\DES::_encryptBlock()
- * @see \phpseclib\Crypt\DES::_decryptBlock()
+ * @see self::_encryptBlock()
+ * @see self::_decryptBlock()
* @access private
- * @param String $block
- * @param Integer $mode
- * @return String
+ * @param string $block
+ * @param int $mode
+ * @return string
*/
function _processBlock($block, $mode)
{
@@ -1310,8 +1307,8 @@ class DES extends Base
$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.
- // (Currently, for Crypt_DES, one generated $lambda_function cost on php5.5@32bit ~135kb unfreeable mem and ~230kb on php5.5@64bit)
- // (Currently, for Crypt_TripleDES, one generated $lambda_function cost on php5.5@32bit ~240kb unfreeable mem and ~340kb on php5.5@64bit)
+ // (Currently, for DES, one generated $lambda_function cost on php5.5@32bit ~135kb unfreeable mem and ~230kb on php5.5@64bit)
+ // (Currently, for TripleDES, one generated $lambda_function cost on php5.5@32bit ~240kb unfreeable mem and ~340kb on php5.5@64bit)
// 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 );
diff --git a/phpseclib/Crypt/Hash.php b/phpseclib/Crypt/Hash.php
index 14b8a32a..1b746037 100644
--- a/phpseclib/Crypt/Hash.php
+++ b/phpseclib/Crypt/Hash.php
@@ -1,26 +1,19 @@
* setKey('abcdefg');
*
@@ -31,7 +24,9 @@
* @category Crypt
* @package Hash
* @author Jim Wigginton
* createKey());
+ * extract(\phpseclib\Crypt\RSA::createKey());
*
- * $plaintext = 'terrafrost';
+ * $plaintext = 'terrafrost';
*
- * $rsa->loadKey($privatekey);
- * $ciphertext = $rsa->encrypt($plaintext);
+ * $ciphertext = $publickey->encrypt($plaintext);
*
- * $rsa->loadKey($publickey);
- * echo $rsa->decrypt($ciphertext);
+ * echo $privatekey->decrypt($ciphertext);
* ?>
*
*
* Here's an example of how to create signatures and verify signatures with this library:
*
* createKey());
+ * extract(\phpseclib\Crypt\RSA::createKey());
*
- * $plaintext = 'terrafrost';
+ * $plaintext = 'terrafrost';
*
- * $rsa->loadKey($privatekey);
- * $signature = $rsa->sign($plaintext);
+ * $signature = $privatekey->sign($plaintext);
*
- * $rsa->loadKey($publickey);
- * echo $rsa->verify($plaintext, $signature) ? 'verified' : 'unverified';
+ * echo $publickey->verify($plaintext, $signature) ? 'verified' : 'unverified';
* ?>
*
*
@@ -51,13 +45,7 @@
namespace phpseclib\Crypt;
-use phpseclib\Crypt\AES;
-use phpseclib\Crypt\Base;
-use phpseclib\Crypt\DES;
-use phpseclib\Crypt\Hash;
-use phpseclib\Crypt\Random;
-use phpseclib\Crypt\RSA;
-use phpseclib\Crypt\TripleDES;
+use phpseclib\File\ASN1;
use phpseclib\Math\BigInteger;
/**
@@ -71,215 +59,136 @@ class RSA
{
/**#@+
* @access public
- * @see \phpseclib\Crypt\RSA::encrypt()
- * @see \phpseclib\Crypt\RSA::decrypt()
+ * @see self::encrypt()
+ * @see self::decrypt()
*/
/**
* Use {@link http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding Optimal Asymmetric Encryption Padding}
* (OAEP) for encryption / decryption.
*
- * Uses sha1 by default.
+ * Uses sha256 by default
*
- * @see \phpseclib\Crypt\RSA::setHash()
- * @see \phpseclib\Crypt\RSA::setMGFHash()
+ * @see self::setHash()
+ * @see self::setMGFHash()
*/
- const ENCRYPTION_OAEP = 1;
+ const PADDING_OAEP = 1;
/**
* Use PKCS#1 padding.
*
- * Although self::ENCRYPTION_OAEP offers more security, including PKCS#1 padding is necessary for purposes of backwards
+ * Although self::PADDING_OAEP / self::PADDING_PSS offers more security, including PKCS#1 padding is necessary for purposes of backwards
* compatibility with protocols (like SSH-1) written before OAEP's introduction.
- */
- const ENCRYPTION_PKCS1 = 2;
+ */
+ const PADDING_PKCS1 = 2;
/**
* Do not use any padding
*
* Although this method is not recommended it can none-the-less sometimes be useful if you're trying to decrypt some legacy
* stuff, if you're trying to diagnose why an encrypted message isn't decrypting, etc.
*/
- const ENCRYPTION_NONE = 3;
+ const PADDING_NONE = 3;
+ /**
+ * Use PKCS#1 padding with PKCS1 v1.5 compatability
+ *
+ * A PKCS1 v2.1 encrypted message may not successfully decrypt with a PKCS1 v1.5 implementation (such as OpenSSL).
+ */
+ const PADDING_PKCS15_COMPAT = 6;
/**#@-*/
/**#@+
* @access public
- * @see \phpseclib\Crypt\RSA::sign()
- * @see \phpseclib\Crypt\RSA::verify()
- * @see \phpseclib\Crypt\RSA::setHash()
- */
+ * @see self::sign()
+ * @see self::verify()
+ * @see self::setHash()
+ */
/**
* Use the Probabilistic Signature Scheme for signing
*
- * Uses sha1 by default.
+ * Uses sha256 and 0 as the salt length
*
- * @see \phpseclib\Crypt\RSA::setSaltLength()
- * @see \phpseclib\Crypt\RSA::setMGFHash()
- */
- const SIGNATURE_PSS = 1;
+ * @see self::setSaltLength()
+ * @see self::setMGFHash()
+ * @see self::setHash()
+ */
+ const PADDING_PSS = 4;
/**
- * Use the PKCS#1 scheme by default.
- *
- * Although self::SIGNATURE_PSS offers more security, including PKCS#1 signing is necessary for purposes of backwards
- * compatibility with protocols (like SSH-2) written before PSS's introduction.
- */
- const SIGNATURE_PKCS1 = 2;
+ * Use a relaxed version of PKCS#1 padding for signature verification
+ */
+ const PADDING_RELAXED_PKCS1 = 5;
/**#@-*/
/**#@+
* @access private
- * @see \phpseclib\Crypt\RSA::createKey()
- */
+ * @see self::createKey()
+ */
/**
* ASN1 Integer
- */
+ */
const ASN1_INTEGER = 2;
/**
* ASN1 Bit String
- */
+ */
const ASN1_BITSTRING = 3;
/**
* ASN1 Octet String
- */
+ */
const ASN1_OCTETSTRING = 4;
/**
* ASN1 Object Identifier
- */
+ */
const ASN1_OBJECT = 6;
/**
* ASN1 Sequence (with the constucted bit set)
- */
+ */
const ASN1_SEQUENCE = 48;
/**#@-*/
/**#@+
* @access private
- * @see \phpseclib\Crypt\RSA::__construct()
- */
+ * @see self::__construct()
+ */
/**
* To use the pure-PHP implementation
- */
+ */
const MODE_INTERNAL = 1;
/**
* To use the OpenSSL library
*
* (if enabled; otherwise, the internal implementation will be used)
- */
+ */
const MODE_OPENSSL = 2;
/**#@-*/
- /**#@+
- * @access public
- * @see \phpseclib\Crypt\RSA::createKey()
- * @see \phpseclib\Crypt\RSA::setPrivateKeyFormat()
- */
- /**
- * PKCS#1 formatted private key
- *
- * Used by OpenSSH
- */
- const PRIVATE_FORMAT_PKCS1 = 0;
- /**
- * PuTTY formatted private key
- */
- const PRIVATE_FORMAT_PUTTY = 1;
- /**
- * XML formatted private key
- */
- const PRIVATE_FORMAT_XML = 2;
- /**
- * PKCS#8 formatted private key
- */
- const PRIVATE_FORMAT_PKCS8 = 3;
- /**#@-*/
-
- /**#@+
- * @access public
- * @see \phpseclib\Crypt\RSA::createKey()
- * @see \phpseclib\Crypt\RSA::setPublicKeyFormat()
- */
- /**
- * Raw public key
- *
- * An array containing two \phpseclib\Math\BigInteger objects.
- *
- * The exponent can be indexed with any of the following:
- *
- * 0, e, exponent, publicExponent
- *
- * The modulus can be indexed with any of the following:
- *
- * 1, n, modulo, modulus
- */
- const PUBLIC_FORMAT_RAW = 3;
- /**
- * 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)
- */
- const PUBLIC_FORMAT_PKCS1 = 4;
- const PUBLIC_FORMAT_PKCS1_RAW = 4;
- /**
- * XML formatted public key
- */
- const PUBLIC_FORMAT_XML = 5;
- /**
- * OpenSSH formatted public key
- *
- * Place in $HOME/.ssh/authorized_keys
- */
- const 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)
- */
- const PUBLIC_FORMAT_PKCS8 = 7;
- /**#@-*/
-
/**
* Precomputed Zero
*
- * @var Array
+ * @var array
* @access private
*/
- var $zero;
+ static $zero;
/**
* Precomputed One
*
- * @var Array
+ * @var array
* @access private
*/
- var $one;
+ static $one;
/**
* Private Key Format
*
- * @var Integer
+ * @var string
* @access private
*/
- var $privateKeyFormat = self::PRIVATE_FORMAT_PKCS1;
+ var $privateKeyFormat = 'PKCS1';
/**
* Public Key Format
*
- * @var Integer
- * @access public
+ * @var string
+ * @access private
*/
- var $publicKeyFormat = self::PUBLIC_FORMAT_PKCS8;
+ var $publicKeyFormat = 'PKCS8';
/**
* Modulus (ie. n)
@@ -308,7 +217,7 @@ class RSA
/**
* Primes for Chinese Remainder Theorem (ie. p and q)
*
- * @var Array
+ * @var array
* @access private
*/
var $primes;
@@ -316,7 +225,7 @@ class RSA
/**
* Exponents for Chinese Remainder Theorem (ie. dP and dQ)
*
- * @var Array
+ * @var array
* @access private
*/
var $exponents;
@@ -324,7 +233,7 @@ class RSA
/**
* Coefficients for Chinese Remainder Theorem (ie. qInv)
*
- * @var Array
+ * @var array
* @access private
*/
var $coefficients;
@@ -332,7 +241,7 @@ class RSA
/**
* Hash name
*
- * @var String
+ * @var string
* @access private
*/
var $hashName;
@@ -348,7 +257,7 @@ class RSA
/**
* Length of hash function output
*
- * @var Integer
+ * @var int
* @access private
*/
var $hLen;
@@ -356,7 +265,7 @@ class RSA
/**
* Length of salt
*
- * @var Integer
+ * @var int
* @access private
*/
var $sLen;
@@ -372,31 +281,15 @@ class RSA
/**
* Length of MGF hash function output
*
- * @var Integer
+ * @var int
* @access private
*/
var $mgfHLen;
- /**
- * Encryption mode
- *
- * @var Integer
- * @access private
- */
- var $encryptionMode = self::ENCRYPTION_OAEP;
-
- /**
- * Signature mode
- *
- * @var Integer
- * @access private
- */
- var $signatureMode = self::SIGNATURE_PSS;
-
/**
* Public Exponent
*
- * @var Mixed
+ * @var mixed
* @access private
*/
var $publicExponent = false;
@@ -404,52 +297,75 @@ class RSA
/**
* Password
*
- * @var String
+ * @var string
* @access private
*/
var $password = false;
/**
- * Components
+ * Loaded File Format
*
- * For use with parsing XML formatted keys. PHP's XML Parser functions use utilized - instead of PHP's DOM functions -
- * because PHP's XML Parser functions work on PHP4 whereas PHP's DOM functions - although surperior - don't.
- *
- * @see \phpseclib\Crypt\RSA::_start_element_handler()
- * @var Array
+ * @var string
* @access private
*/
- var $components = array();
-
- /**
- * Current String
- *
- * For use with parsing XML formatted keys.
- *
- * @see \phpseclib\Crypt\RSA::_character_handler()
- * @see \phpseclib\Crypt\RSA::_stop_element_handler()
- * @var Mixed
- * @access private
- */
- var $current;
+ var $format = false;
/**
* OpenSSL configuration file name.
*
* Set to null to use system configuration file.
- * @see \phpseclib\Crypt\RSA::createKey()
- * @var Mixed
- * @Access public
+ *
+ * @see self::createKey()
+ * @var mixed
+ * @access public
*/
- var $configFile;
+ static $configFile;
/**
- * Public key comment field.
+ * Supported file formats (lower case)
*
- * @var String
+ * @see self::_initialize_static_variables()
+ * @var array
* @access private
*/
- var $comment = 'phpseclib-generated-key';
+ static $fileFormats = false;
+
+ /**
+ * Supported file formats (original case)
+ *
+ * @see self::_initialize_static_variables()
+ * @var array
+ * @access private
+ */
+ static $origFileFormats = false;
+
+
+ /**
+ * Initialize static variables
+ *
+ * @access private
+ */
+ static function _initialize_static_variables()
+ {
+ if (!isset(self::$zero)) {
+ self::$zero= new BigInteger(0);
+ self::$one = new BigInteger(1);
+ self::$configFile = __DIR__ . '/../openssl.cnf';
+
+ if (self::$fileFormats === false) {
+ self::$fileFormats = array();
+ foreach (glob(__DIR__ . '/RSA/*.php') as $file) {
+ $name = pathinfo($file, PATHINFO_FILENAME);
+ $type = 'phpseclib\Crypt\RSA\\' . $name;
+ $meta = new \ReflectionClass($type);
+ if (!$meta->isAbstract()) {
+ self::$fileFormats[strtolower($name)] = $type;
+ self::$origFileFormats[] = $name;
+ }
+ }
+ }
+ }
+ }
/**
* The constructor
@@ -463,7 +379,32 @@ class RSA
*/
function __construct()
{
- $this->configFile = dirname(__FILE__) . '/../openssl.cnf';
+ self::_initialize_static_variables();
+
+ $this->hash = new Hash('sha256');
+ $this->hLen = $this->hash->getLength();
+ $this->hashName = 'sha256';
+ $this->mgfHash = new Hash('sha256');
+ $this->mgfHLen = $this->mgfHash->getLength();
+ }
+
+ /**
+ * Create public / private key pair
+ *
+ * Returns an array with the following three elements:
+ * - 'privatekey': The private key.
+ * - 'publickey': The public key.
+ * - 'partialkey': A partially computed key (if the execution time exceeded $timeout).
+ * Will need to be passed back to \phpseclib\Crypt\RSA::createKey() as the third parameter for further processing.
+ *
+ * @access public
+ * @param int $bits
+ * @param int $timeout
+ * @param array $p
+ */
+ static function createKey($bits = 2048, $timeout = false, $partial = array())
+ {
+ self::_initialize_static_variables();
if (!defined('CRYPT_RSA_MODE')) {
switch (true) {
@@ -473,11 +414,7 @@ class RSA
case defined('MATH_BIGINTEGER_OPENSSL_DISABLE'):
define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
break;
- // 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', self::MODE_INTERNAL);
- break;
- case extension_loaded('openssl') && version_compare(PHP_VERSION, '4.2.0', '>=') && file_exists($this->configFile):
+ case extension_loaded('openssl') && file_exists(self::$configFile):
// some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
ob_start();
@phpinfo();
@@ -517,32 +454,6 @@ class RSA
}
}
- $this->zero = new BigInteger();
- $this->one = new BigInteger(1);
-
- $this->hash = new Hash('sha1');
- $this->hLen = $this->hash->getLength();
- $this->hashName = 'sha1';
- $this->mgfHash = new Hash('sha1');
- $this->mgfHLen = $this->mgfHash->getLength();
- }
-
- /**
- * Create public / private key pair
- *
- * Returns an array with the following three elements:
- * - 'privatekey': The private key.
- * - 'publickey': The public key.
- * - 'partialkey': A partially computed key (if the execution time exceeded $timeout).
- * Will need to be passed back to \phpseclib\Crypt\RSA::createKey() as the third parameter for further processing.
- *
- * @access public
- * @param optional Integer $bits
- * @param optional Integer $timeout
- * @param optional array $p
- */
- function createKey($bits = 1024, $timeout = false, $partial = array())
- {
if (!defined('CRYPT_RSA_EXPONENT')) {
// http://en.wikipedia.org/wiki/65537_%28number%29
define('CRYPT_RSA_EXPONENT', '65537');
@@ -560,16 +471,17 @@ class RSA
// OpenSSL uses 65537 as the exponent and requires RSA keys be 384 bits minimum
if (CRYPT_RSA_MODE == self::MODE_OPENSSL && $bits >= 384 && CRYPT_RSA_EXPONENT == 65537) {
$config = array();
- if (isset($this->configFile)) {
- $config['config'] = $this->configFile;
+ if (isset(self::$configFile)) {
+ $config['config'] = self::$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'];
+ openssl_pkey_export($rsa, $privatekeystr, null, $config);
+ $privatekey = new RSA();
+ $privatekey->load($privatekeystr);
- $privatekey = call_user_func_array(array($this, '_convertPrivateKey'), array_values($this->_parseKey($privatekey, self::PRIVATE_FORMAT_PKCS1)));
- $publickey = call_user_func_array(array($this, '_convertPublicKey'), array_values($this->_parseKey($publickey, self::PUBLIC_FORMAT_PKCS1)));
+ $publickeyarr = openssl_pkey_get_details($rsa);
+ $publickey = new RSA();
+ $publickey->load($publickeyarr['key']);
// clear the buffer of error strings stemming from a minimalistic openssl.cnf
while (openssl_error_string() !== false) {
@@ -587,7 +499,7 @@ class RSA
$e = new BigInteger(CRYPT_RSA_EXPONENT);
}
- extract($this->_generateMinMax($bits));
+ extract(self::_generateMinMax($bits));
$absoluteMin = $min;
$temp = $bits >> 1; // divide by two to see how many bits P and Q would be
if ($temp > CRYPT_RSA_SMALLEST_PRIME) {
@@ -596,19 +508,17 @@ class RSA
} else {
$num_primes = 2;
}
- extract($this->_generateMinMax($temp + $bits % $temp));
+ extract(self::_generateMinMax($temp + $bits % $temp));
$finalMax = $max;
- extract($this->_generateMinMax($temp));
+ extract(self::_generateMinMax($temp));
- $generator = new BigInteger();
-
- $n = $this->one->copy();
+ $n = clone self::$one;
if (!empty($partial)) {
extract(unserialize($partial));
} else {
$exponents = $coefficients = $primes = array();
$lcm = array(
- 'top' => $this->one->copy(),
+ 'top' => clone self::$one,
'bottom' => false
);
}
@@ -637,12 +547,12 @@ class RSA
if ($i == $num_primes) {
list($min, $temp) = $absoluteMin->divide($n);
- if (!$temp->equals($this->zero)) {
- $min = $min->add($this->one); // ie. ceil()
+ if (!$temp->equals(self::$zero)) {
+ $min = $min->add(self::$one); // ie. ceil()
}
- $primes[$i] = $generator->randomPrime($min, $finalMax, $timeout);
+ $primes[$i] = BigInteger::randomPrime($min, $finalMax, $timeout);
} else {
- $primes[$i] = $generator->randomPrime($min, $max, $timeout);
+ $primes[$i] = BigInteger::randomPrime($min, $max, $timeout);
}
if ($primes[$i] === false) { // if we've reached the timeout
@@ -659,8 +569,8 @@ class RSA
}
return array(
- 'privatekey' => '',
- 'publickey' => '',
+ 'privatekey' => false,
+ 'publickey' => false,
'partialkey' => $partialkey
);
}
@@ -673,7 +583,7 @@ class RSA
$n = $n->multiply($primes[$i]);
- $temp = $primes[$i]->subtract($this->one);
+ $temp = $primes[$i]->subtract(self::$one);
// textbook RSA implementations use Euler's totient function instead of the least common multiple.
// see http://en.wikipedia.org/wiki/Euler%27s_totient_function
@@ -686,7 +596,7 @@ class RSA
list($temp) = $lcm['top']->divide($lcm['bottom']);
$gcd = $temp->gcd($e);
$i0 = 1;
- } while (!$gcd->equals($this->one));
+ } while (!$gcd->equals(self::$one));
$d = $e->modInverse($temp);
@@ -705,804 +615,62 @@ class RSA
// coefficient INTEGER, -- (inverse of q) mod p
// otherPrimeInfos OtherPrimeInfos OPTIONAL
// }
+ $privatekey = new RSA();
+ $privatekey->modulus = $n;
+ $privatekey->k = $bits >> 3;
+ $privatekey->publicExponent = $e;
+ $privatekey->exponent = $d;
+ $privatekey->privateExponent = $e;
+ $privatekey->primes = $primes;
+ $privatekey->exponents = $exponents;
+ $privatekey->coefficients = $coefficients;
+
+ $publickey = new RSA();
+ $publickey->modulus = $n;
+ $publickey->k = $bits >> 3;
+ $publickey->exponent = $e;
return array(
- 'privatekey' => $this->_convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients),
- 'publickey' => $this->_convertPublicKey($n, $e),
+ 'privatekey' => $privatekey,
+ 'publickey' => $publickey,
'partialkey' => false
);
}
/**
- * Convert a private key to the appropriate format.
+ * Add a fileformat plugin
*
- * @access private
- * @see setPrivateKeyFormat()
- * @param String $RSAPrivateKey
- * @return String
+ * The plugin needs to either already be loaded or be auto-loadable.
+ * Loading a plugin whose shortname overwrite an existing shortname will overwrite the old plugin.
+ *
+ * @see self::load()
+ * @param string $fullname
+ * @access public
+ * @return bool
*/
- function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
+ static function addFileFormat($fullname)
{
- $signed = $this->privateKeyFormat != self::PRIVATE_FORMAT_XML;
- $num_primes = count($primes);
- $raw = array(
- 'version' => $num_primes == 2 ? chr(0) : chr(1), // two-prime vs. multi
- 'modulus' => $n->toBytes($signed),
- 'publicExponent' => $e->toBytes($signed),
- 'privateExponent' => $d->toBytes($signed),
- 'prime1' => $primes[1]->toBytes($signed),
- 'prime2' => $primes[2]->toBytes($signed),
- 'exponent1' => $exponents[1]->toBytes($signed),
- 'exponent2' => $exponents[2]->toBytes($signed),
- 'coefficient' => $coefficients[2]->toBytes($signed)
- );
+ self::_initialize_static_variables();
- // if the format in question does not support multi-prime rsa and multi-prime rsa was used,
- // call _convertPublicKey() instead.
- switch ($this->privateKeyFormat) {
- case self::PRIVATE_FORMAT_XML:
- if ($num_primes != 2) {
- return false;
- }
- return "' . base64_encode($raw['prime1']) . "
\r\n" . - '' . base64_encode($raw['prime2']) . "\r\n" . - '
' . base64_encode($primes[1]->toBytes()) . "
\r\n" . + '' . base64_encode($primes[2]->toBytes()) . "\r\n" . + '