Skip to content

Commit

Permalink
Merge pull request #213 from owncloud/phpseclib-dev-to-2.0.0
Browse files Browse the repository at this point in the history 
Phpseclib dev to 2.0.0
  • Loading branch information
@DeepDiver1975
DeepDiver1975 committed Oct 26, 2015
2 parents 3fc181b + 2730626 commit 48dd23b
Show file tree
Hide file tree
Showing 9 changed files with 107 additions and 1,909 deletions.
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ phpseclib/phpseclib/phpunit.xml.dist
phpseclib/phpseclib/build/
phpseclib/phpseclib/tests/
phpseclib/phpseclib/travis/
phpseclib/phpseclib/CHANGELOG.md
phpseclib/phpseclib/README.md
phpseclib/phpseclib/composer.json
phpseclib/phpseclib/composer.lock
phpseclib/phpseclib/phpunit.xml.dist

symfony/console/Symfony/Component/Console/Tests
symfony/console/Symfony/Component/Console/.gitignore
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"sabre/dav" : "2.1.7",
"doctrine/dbal": "2.5.1",
"mcnetic/zipstreamer": "v0.7",
"phpseclib/phpseclib": "~2.0@dev",
"phpseclib/phpseclib": "2.0.0",
"rackspace/php-opencloud": "v1.9.2",
"james-heinrich/getid3": "dev-master",
"jeremeamia/superclosure": "2.0.0",
Expand Down
19 changes: 10 additions & 9 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion composer/include_paths.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
$baseDir = $vendorDir;

return array(
$vendorDir . '/phpseclib/phpseclib/phpseclib',
$vendorDir . '/pear/console_getopt',
$vendorDir . '/pear/pear_exception',
$vendorDir . '/pear/pear-core-minimal/src',
$vendorDir . '/pear/archive_tar',
$vendorDir . '/phpseclib/phpseclib/phpseclib',
);
178 changes: 90 additions & 88 deletions composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1443,94 +1443,6 @@
],
"description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function."
},
{
"name": "phpseclib/phpseclib",
"version": "2.0.x-dev",
"version_normalized": "2.0.9999999.9999999-dev",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "772d4df5975a721d9c2cc79ca4da1339798c2c86"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/bff8e3093f126ea8219b4eecbe00b7636e76efe3",
"reference": "772d4df5975a721d9c2cc79ca4da1339798c2c86",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"phing/phing": "~2.7",
"phpunit/phpunit": "~4.0",
"sami/sami": "~2.0",
"squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
"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."
},
"time": "2015-07-28 23:09:20",
"type": "library",
"installation-source": "source",
"autoload": {
"psr-4": {
"phpseclib\\": "phpseclib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"include-path": [
"phpseclib/"
],
"license": [
"MIT"
],
"authors": [
{
"name": "Jim Wigginton",
"email": "terrafrost@php.net",
"role": "Lead Developer"
},
{
"name": "Patrick Monnerat",
"email": "pm@datasphere.ch",
"role": "Developer"
},
{
"name": "Andreas Fischer",
"email": "bantu@phpbb.com",
"role": "Developer"
},
{
"name": "Hans-Jürgen Petrich",
"email": "petrich@tronic-media.com",
"role": "Developer"
}
],
"description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
"homepage": "http://phpseclib.sourceforge.net",
"keywords": [
"BigInteger",
"aes",
"asn.1",
"asn1",
"blowfish",
"crypto",
"cryptography",
"encryption",
"rsa",
"security",
"sftp",
"signature",
"signing",
"ssh",
"twofish",
"x.509",
"x509"
]
},
{
"name": "pear/console_getopt",
"version": "v1.4.1",
Expand Down Expand Up @@ -2753,5 +2665,95 @@
"utf-8",
"utf8"
]
},
{
"name": "phpseclib/phpseclib",
"version": "2.0.0",
"version_normalized": "2.0.0.0",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
"reference": "a74aa9efbe61430fcb60157c8e025a48ec8ff604"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/a74aa9efbe61430fcb60157c8e025a48ec8ff604",
"reference": "a74aa9efbe61430fcb60157c8e025a48ec8ff604",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"require-dev": {
"phing/phing": "~2.7",
"phpunit/phpunit": "~4.0",
"sami/sami": "~2.0",
"squizlabs/php_codesniffer": "~2.0"
},
"suggest": {
"ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
"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 few other cryptographic operations.",
"ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
"pear-pear/PHP_Compat": "Install PHP_Compat to get phpseclib working on PHP < 5.0.0."
},
"time": "2015-08-04 04:48:03",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-4": {
"phpseclib\\": "phpseclib/"
}
},
"notification-url": "https://packagist.org/downloads/",
"include-path": [
"phpseclib/"
],
"license": [
"MIT"
],
"authors": [
{
"name": "Jim Wigginton",
"email": "terrafrost@php.net",
"role": "Lead Developer"
},
{
"name": "Patrick Monnerat",
"email": "pm@datasphere.ch",
"role": "Developer"
},
{
"name": "Andreas Fischer",
"email": "bantu@phpbb.com",
"role": "Developer"
},
{
"name": "Hans-Jürgen Petrich",
"email": "petrich@tronic-media.com",
"role": "Developer"
}
],
"description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
"homepage": "http://phpseclib.sourceforge.net",
"keywords": [
"BigInteger",
"aes",
"asn.1",
"asn1",
"blowfish",
"crypto",
"cryptography",
"encryption",
"rsa",
"security",
"sftp",
"signature",
"signing",
"ssh",
"twofish",
"x.509",
"x509"
]
}
]
89 changes: 0 additions & 89 deletions phpseclib/phpseclib/CHANGELOG.md
View file

This file was deleted.

0 comments on commit 48dd23b

Please sign in to comment.