Updated to phpseclib 2.0.0 and latest openpgp-php.

Hopefully this fixes issues with PHP 7 on Travis.

framework/Pgp/bundle/CHANGED

@@ -3,24 +3,14 @@ List of changes from upstream sources:
 - vendor/singpolyma/openpgp-php/lib/openpgp.php
 
   Split output armor text every 76 characters (OpenPGP::enarmor()).
-  Fix computing signatures for v3 packets (OpenPGP_SignaturePacket#read()).
-  Add support for partial packet body lengths (OpenPGP_Packet::parse()).
-  Fix setting version in symmetric-key encrypted session key packet
-  (OpenPGP_SymmetricSessionKeyPacket#__construct()).
   Fix determining message structure when attempting to verify User ID
   signatures (OpenPGP_Message#signatures()).
   Fix ignoring a 0x30 byte (OpenPGP_Packet#read_byte()).
-
-- vendor/singpolyma/openpgp-php/lib/openpgp_crypt_rsa.php
-
-  Fixed loading Crypt/RSA.php multiple times.
-  Fixed typo of 'encrypted_data' property (OpenPGP_Crypt_RSA#decrypt()).
+  Fix computing signatures for v3 packets (OpenPGP_SignaturePacket#read()).
 
 - vendor/singpolyma/openpgp-php/lib/openpgp_crypt_symmetric.php
 
   Added support for using the openssl extension to parse CAST128 data
   (OpenPGP_Crypt_Symmetric::getCipher()).
   Added support for the Blowfish and Twofish ciphers
-  (OpenPGP_Crypt_Symmetric::getCipher()).
-  Fix setting salt size in S2K object when symmetrically encrypting
-  (OpenPGP_Crypt_Symmetric::encrypt()).
+  (namespace import, constants, OpenPGP_Crypt_Symmetric::getCipher()).

framework/Pgp/bundle/composer.json

@@ -1,12 +1,6 @@
 {
-    "repositories": [
-        {
-            "type": "git",
-            "url": "https://github.com/singpolyma/openpgp-php.git"
-        }
-    ],
     "minimum-stability": "dev",
-    "require-dev": {
+    "require": {
         "singpolyma/openpgp-php": "*"
     }
 }

framework/Pgp/bundle/vendor/composer/LICENSE

@@ -0,0 +1,20 @@
+
+Copyright (c) 2015 Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

framework/Pgp/bundle/vendor/composer/autoload_namespaces.php

@@ -6,9 +6,4 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'System' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
-    'Net' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
-    'Math' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
-    'File' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
-    'Crypt' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
 );

framework/Pgp/bundle/vendor/composer/autoload_psr4.php

@@ -6,4 +6,5 @@
 $baseDir = dirname($vendorDir);
 
 return array(
+    'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
 );

framework/Pgp/bundle/vendor/composer/autoload_real.php

@@ -44,11 +44,6 @@ public static function getLoader()
 
         $loader->register(true);
 
-        $includeFiles = require __DIR__ . '/autoload_files.php';
-        foreach ($includeFiles as $file) {
-            composerRequirec1979ea69b1d8f4059205f2b1ddf2ab9($file);
-        }
-
         return $loader;
     }
 }

framework/Pgp/bundle/vendor/composer/installed.json

@@ -1,52 +1,42 @@
 [
     {
         "name": "phpseclib/phpseclib",
-        "version": "0.3.10",
-        "version_normalized": "0.3.10.0",
+        "version": "2.0.0",
+        "version_normalized": "2.0.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/phpseclib/phpseclib.git",
-            "reference": "d15bba1edcc7c89e09cc74c5d961317a8b947bf4"
+            "reference": "a74aa9efbe61430fcb60157c8e025a48ec8ff604"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d15bba1edcc7c89e09cc74c5d961317a8b947bf4",
-            "reference": "d15bba1edcc7c89e09cc74c5d961317a8b947bf4",
+            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/a74aa9efbe61430fcb60157c8e025a48ec8ff604",
+            "reference": "a74aa9efbe61430fcb60157c8e025a48ec8ff604",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.0.0"
+            "php": ">=5.3.3"
         },
         "require-dev": {
             "phing/phing": "~2.7",
             "phpunit/phpunit": "~4.0",
             "sami/sami": "~2.0",
-            "squizlabs/php_codesniffer": "~1.5"
+            "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-mcrypt": "Install the Mcrypt 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 < 4.3.3."
+            "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-01-28 21:50:33",
+        "time": "2015-08-04 04:48:03",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "0.3-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Crypt": "phpseclib/",
-                "File": "phpseclib/",
-                "Math": "phpseclib/",
-                "Net": "phpseclib/",
-                "System": "phpseclib/"
-            },
-            "files": [
-                "phpseclib/Crypt/Random.php"
-            ]
+            "psr-4": {
+                "phpseclib\\": "phpseclib/"
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
         "include-path": [
@@ -106,22 +96,29 @@
         "source": {
             "type": "git",
             "url": "https://github.com/singpolyma/openpgp-php.git",
-            "reference": "4756c82118ac4fb6cbda632518c9ada292ba6973"
+            "reference": "a1fe3a6e58c83a7c84a954397ac0bbc373a12fc7"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/singpolyma/openpgp-php/zipball/a1fe3a6e58c83a7c84a954397ac0bbc373a12fc7",
+            "reference": "a1fe3a6e58c83a7c84a954397ac0bbc373a12fc7",
+            "shasum": ""
         },
         "require": {
-            "phpseclib/phpseclib": "~0.3"
+            "phpseclib/phpseclib": "2.0.0"
         },
         "require-dev": {
             "phpunit/phpunit": "~4.0"
         },
-        "time": "2015-03-16 20:04:34",
+        "time": "2015-11-30 19:49:15",
         "type": "library",
         "installation-source": "source",
         "autoload": {
             "classmap": [
                 "lib/"
             ]
         },
+        "notification-url": "https://packagist.org/downloads/",
         "license": [
             "Unlicense"
         ],

framework/Pgp/bundle/vendor/phpseclib/phpseclib/.travis.yml

@@ -3,7 +3,6 @@ language: php
 # When adding environments here, the number of runs specified in .scrutinizer.yml
 # may have to be adjusted.
 php:
-  - 5.2
   - 5.3.3
   - 5.3
   - 5.4
@@ -24,12 +23,11 @@ install:
   - eval `ssh-agent -s`
   - travis/setup-secure-shell.sh
   - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/install-php-extensions.sh; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then travis/setup-composer.sh; fi"
+  - travis/setup-composer.sh
 
 script:
   - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' ]; then vendor/bin/phing -f build/build.xml sniff; fi"
   - travis/run-phpunit.sh
 
 after_success:
   - sh -c "if $TRAVIS_SECURE_ENV_VARS; then travis/upload-code-coverage-html.sh; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' -a '$TRAVIS_PHP_VERSION' != 'hhvm' ]; then travis/upload-code-coverage-scrutinizer.sh; fi"

framework/Pgp/bundle/vendor/phpseclib/phpseclib/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 1.0.0 - 2015-08-02
+
+- OpenSSL support for symmetric ciphers ([#507](https://github.com/phpseclib/phpseclib/pull/507))
+- rewritten vt100 terminal emulator (File_ANSI) ([#689](https://github.com/phpseclib/phpseclib/pull/689))
+- agent-forwarding support (System_SSH_Agent) ([#592](https://github.com/phpseclib/phpseclib/pull/592))
+- Net_SSH2 improvements
+ - diffie-hellman-group-exchange-sha1/sha256 support ([#714](https://github.com/phpseclib/phpseclib/pull/714))
+ - window size handling updates ([#717](https://github.com/phpseclib/phpseclib/pull/717))
+- Net_SFTP improvements
+ - add callback support to put() ([#655](https://github.com/phpseclib/phpseclib/pull/655))
+ - stat cache fixes ([#743](https://github.com/phpseclib/phpseclib/issues/743), [#730](https://github.com/phpseclib/phpseclib/issues/730), [#709](https://github.com/phpseclib/phpseclib/issues/709), [#726](https://github.com/phpseclib/phpseclib/issues/726))
+- add "none" encryption mode to Crypt_RSA ([#692](https://github.com/phpseclib/phpseclib/pull/692))
+- misc ASN.1 / X.509 parsing fixes ([#721](https://github.com/phpseclib/phpseclib/pull/721), [#627](https://github.com/phpseclib/phpseclib/pull/627))
+- use a random serial number for new X509 certs ([#740](https://github.com/phpseclib/phpseclib/pull/740))
+- add getPublicKeyFingerprint() to Crypt_RSA ([#677](https://github.com/phpseclib/phpseclib/pull/677))
+
+## 0.3.10 - 2015-02-04
+
+- simplify SSH2 window size handling ([#538](https://github.com/phpseclib/phpseclib/pull/538))
+- slightly relax the conditions under which OpenSSL is used ([#598](https://github.com/phpseclib/phpseclib/pull/598))
+- fix issue with empty constructed context-specific tags in ASN1 ([#606](https://github.com/phpseclib/phpseclib/pull/606))
+
 ## 0.3.9 - 2014-11-09
 
 - PHP 5.6 improvements ([#482](https://github.com/phpseclib/phpseclib/pull/482), [#491](https://github.com/phpseclib/phpseclib/issues/491))