Bump phpseclib/phpseclib from 2.0.25 to 2.0.30

Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 2.0.25 to 2.0.30. - [Release notes](https://github.com/phpseclib/phpseclib/releases) - [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md) - [Commits](phpseclib/phpseclib@2.0.25...2.0.30) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Jan 19, 2021 · 341042d · 341042d
1 parent 08d4d2a
commit 341042d
Show file tree

Hide file tree

Showing 19 changed files with 390 additions and 219 deletions.
diff --git a/.gitignore b/.gitignore
@@ -169,6 +169,7 @@ phpseclib/phpseclib/phpunit.xml.dist
 phpseclib/phpseclib/build/
 phpseclib/phpseclib/tests/
 phpseclib/phpseclib/travis/
+phpseclib/phpseclib/BACKERS.md
 phpseclib/phpseclib/CHANGELOG.md
 phpseclib/phpseclib/README.md
 phpseclib/phpseclib/composer.json

diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
 		"patchwork/jsqueeze": "^2.0",
 		"pear/archive_tar": "^1.4.9",
 		"pear/pear-core-minimal": "^v1.10",
-		"phpseclib/phpseclib": "2.0.25",
+		"phpseclib/phpseclib": "2.0.30",
 		"php-http/guzzle7-adapter": "^0.1.1",
 		"php-opencloud/openstack": "^3.1",
 		"pimple/pimple": "3.3.1",

diff --git a/composer.lock b/composer.lock
diff --git a/composer/InstalledVersions.php b/composer/InstalledVersions.php
@@ -29,7 +29,7 @@ class InstalledVersions
     'aliases' => 
     array (
     ),
-    'reference' => 'a9db460535cf4f02e8004ccd22fefffe2a11026e',
+    'reference' => '89184bb343bc24ea8fbfbd983829e9e74e31cf54',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -302,7 +302,7 @@ class InstalledVersions
       'aliases' => 
       array (
       ),
-      'reference' => 'a9db460535cf4f02e8004ccd22fefffe2a11026e',
+      'reference' => '89184bb343bc24ea8fbfbd983829e9e74e31cf54',
     ),
     'nextcloud/lognormalizer' => 
     array (
@@ -444,12 +444,12 @@ class InstalledVersions
     ),
     'phpseclib/phpseclib' => 
     array (
-      'pretty_version' => '2.0.25',
-      'version' => '2.0.25.0',
+      'pretty_version' => '2.0.30',
+      'version' => '2.0.30.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'c18159618ed7cd7ff721ac1a8fec7860a475d2f0',
+      'reference' => '136b9ca7eebef78be14abf90d65c5e57b6bc5d36',
     ),
     'pimple/pimple' => 
     array (

diff --git a/composer/installed.json b/composer/installed.json
@@ -2839,26 +2839,25 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.25",
-            "version_normalized": "2.0.25.0",
+            "version": "2.0.30",
+            "version_normalized": "2.0.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "c18159618ed7cd7ff721ac1a8fec7860a475d2f0"
+                "reference": "136b9ca7eebef78be14abf90d65c5e57b6bc5d36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c18159618ed7cd7ff721ac1a8fec7860a475d2f0",
-                "reference": "c18159618ed7cd7ff721ac1a8fec7860a475d2f0",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/136b9ca7eebef78be14abf90d65c5e57b6bc5d36",
+                "reference": "136b9ca7eebef78be14abf90d65c5e57b6bc5d36",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
                 "phing/phing": "~2.7",
-                "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
-                "sami/sami": "~2.0",
+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4",
                 "squizlabs/php_codesniffer": "~2.0"
             },
             "suggest": {
@@ -2867,7 +2866,7 @@
                 "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."
             },
-            "time": "2020-02-25T04:16:50+00:00",
+            "time": "2020-12-17T05:42:04+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -2930,6 +2929,24 @@
                 "x.509",
                 "x509"
             ],
+            "support": {
+                "issues": "https://github.com/phpseclib/phpseclib/issues",
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.30"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/terrafrost",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpseclib",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
+                    "type": "tidelift"
+                }
+            ],
             "install-path": "../phpseclib/phpseclib"
         },
         {

diff --git a/composer/installed.php b/composer/installed.php
@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => 'a9db460535cf4f02e8004ccd22fefffe2a11026e',
+    'reference' => '89184bb343bc24ea8fbfbd983829e9e74e31cf54',
     'name' => 'nextcloud/3rdparty',
   ),
   'versions' => 
@@ -279,7 +279,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => 'a9db460535cf4f02e8004ccd22fefffe2a11026e',
+      'reference' => '89184bb343bc24ea8fbfbd983829e9e74e31cf54',
     ),
     'nextcloud/lognormalizer' => 
     array (
@@ -421,12 +421,12 @@
     ),
     'phpseclib/phpseclib' => 
     array (
-      'pretty_version' => '2.0.25',
-      'version' => '2.0.25.0',
+      'pretty_version' => '2.0.30',
+      'version' => '2.0.30.0',
       'aliases' => 
       array (
       ),
-      'reference' => 'c18159618ed7cd7ff721ac1a8fec7860a475d2f0',
+      'reference' => '136b9ca7eebef78be14abf90d65c5e57b6bc5d36',
     ),
     'pimple/pimple' => 
     array (

diff --git a/composer/package-versions-deprecated/src/PackageVersions/Versions.php b/composer/package-versions-deprecated/src/PackageVersions/Versions.php
@@ -75,7 +75,7 @@ final class Versions
   'php-http/httplug' => '2.2.0@191a0a1b41ed026b717421931f8d3bd2514ffbf9',
   'php-http/promise' => '1.1.0@4c4c1f9b7289a2ec57cde7f1e9762a5789506f88',
   'php-opencloud/openstack' => 'v3.1.0@7b0eeb63defe533fb802514af3c70855c45eaf1e',
-  'phpseclib/phpseclib' => '2.0.25@c18159618ed7cd7ff721ac1a8fec7860a475d2f0',
+  'phpseclib/phpseclib' => '2.0.30@136b9ca7eebef78be14abf90d65c5e57b6bc5d36',
   'pimple/pimple' => 'v3.3.1@21e45061c3429b1e06233475cc0e1f6fc774d5b0',
   'psr/container' => '1.0.0@b7ce3b176482dbbc1245ebf52b181af44c2cf55f',
   'psr/http-client' => '1.0.1@2dfb5f6c5eff0e91e20e913f8c5452ed95b86621',
@@ -118,7 +118,7 @@ final class Versions
   'web-auth/cose-lib' => 'v3.3.1@eea6fae63ff5c81bf98c115b1be5f38a69682c16',
   'web-auth/metadata-service' => 'v3.3.1@8488d3a832a38cc81c670fce05de1e515c6e64b1',
   'web-auth/webauthn-lib' => 'v3.3.1@e411527a41c1013512fccdfce61681eb36484c77',
-  'nextcloud/3rdparty' => 'dev-master@a9db460535cf4f02e8004ccd22fefffe2a11026e',
+  'nextcloud/3rdparty' => 'dev-master@89184bb343bc24ea8fbfbd983829e9e74e31cf54',
 );
 
     private function __construct()

diff --git a/phpseclib/phpseclib/phpseclib/Crypt/Base.php b/phpseclib/phpseclib/phpseclib/Crypt/Base.php
@@ -413,7 +413,7 @@ abstract class Base
      * @var mixed
      * @access private
      */
-    var $use_inline_crypt;
+    var $use_inline_crypt = true;
 
     /**
      * If OpenSSL can be used in ECB but not in CTR we can emulate CTR
@@ -495,11 +495,6 @@ function __construct($mode = self::MODE_CBC)
         }
 
         $this->_setEngine();
-
-        // Determining whether inline crypting can be used by the cipher
-        if ($this->use_inline_crypt !== false) {
-            $this->use_inline_crypt = version_compare(PHP_VERSION, '5.3.0') >= 0 || function_exists('create_function');
-        }
     }
 
     /**
@@ -2602,12 +2597,8 @@ function _createInlineCryptFunction($cipher_code)
         }
 
         // Create the $inline function and return its name as string. Ready to run!
-        if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
-            eval('$func = function ($_action, &$self, $_text) { ' . $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' } };');
-            return $func;
-        }
-
-        return create_function('$_action, &$self, $_text', $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }');
+        eval('$func = function ($_action, &$self, $_text) { ' . $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' } };');
+        return $func;
     }
 
     /**
@@ -2636,7 +2627,7 @@ function &_getLambdaFunctions()
      *
      * @see self::_setupInlineCrypt()
      * @access private
-     * @param $bytes
+     * @param string $bytes
      * @return string
      */
     function _hashInlineCryptFunction($bytes)

diff --git a/phpseclib/phpseclib/phpseclib/Crypt/Hash.php b/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
@@ -849,7 +849,6 @@ function _not($int)
      * _sha256() adds multiple unsigned 32-bit integers.  Since PHP doesn't support unsigned integers and since the
      * possibility of overflow exists, care has to be taken.  BigInteger could be used but this should be faster.
      *
-     * @param int $...
      * @return int
      * @see self::_sha256()
      * @access private