diff options
author | Björn Schießle <bjoern@schiessle.org> | 2019-04-15 11:43:26 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-15 11:43:26 +0300 |
commit | 0b0ddcc9efe00806b606fb3a816e46b772a395ed (patch) | |
tree | 53ca7c915f6b3518ab5dc47a5944b1cf16cb2d8d /3rdparty | |
parent | bfc725bb490fe593baaa0adf7faa393b64686cac (diff) | |
parent | 6c500e158d7a54f5d544fdcb4e8cac6ac5fff501 (diff) |
Merge pull request #302 from nextcloud/bump/xmlseclibs/3.0.3
Bump xmlseclibs to 3.0.3
Diffstat (limited to '3rdparty')
8 files changed, 39 insertions, 65 deletions
diff --git a/3rdparty/vendor/composer/ClassLoader.php b/3rdparty/vendor/composer/ClassLoader.php index 95f7e097..fce8549f 100644 --- a/3rdparty/vendor/composer/ClassLoader.php +++ b/3rdparty/vendor/composer/ClassLoader.php @@ -279,7 +279,7 @@ class ClassLoader */ public function setApcuPrefix($apcuPrefix) { - $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null; + $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null; } /** diff --git a/3rdparty/vendor/composer/LICENSE b/3rdparty/vendor/composer/LICENSE index f0157a6e..f27399a0 100644 --- a/3rdparty/vendor/composer/LICENSE +++ b/3rdparty/vendor/composer/LICENSE @@ -1,56 +1,21 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: Composer -Upstream-Contact: Jordi Boggiano <j.boggiano@seld.be> -Source: https://github.com/composer/composer -Files: * -Copyright: 2016, Nils Adermann <naderman@naderman.de> - 2016, Jordi Boggiano <j.boggiano@seld.be> -License: Expat +Copyright (c) Nils Adermann, Jordi Boggiano -Files: src/Composer/Util/TlsHelper.php -Copyright: 2016, Nils Adermann <naderman@naderman.de> - 2016, Jordi Boggiano <j.boggiano@seld.be> - 2013, Evan Coury <me@evancoury.com> -License: Expat and BSD-2-Clause +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: -License: BSD-2-Clause - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - . - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +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. -License: Expat - 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. diff --git a/3rdparty/vendor/composer/installed.json b/3rdparty/vendor/composer/installed.json index 5e69b077..db0275ab 100644 --- a/3rdparty/vendor/composer/installed.json +++ b/3rdparty/vendor/composer/installed.json @@ -98,24 +98,24 @@ }, { "name": "robrichards/xmlseclibs", - "version": "3.0.2", - "version_normalized": "3.0.2.0", + "version": "3.0.3", + "version_normalized": "3.0.3.0", "source": { "type": "git", "url": "https://github.com/robrichards/xmlseclibs.git", - "reference": "1f4de0c0d121922aafd8c62c2a9f5e528830cf38" + "reference": "406c68ac9124db033d079284b719958b829cb830" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/1f4de0c0d121922aafd8c62c2a9f5e528830cf38", - "reference": "1f4de0c0d121922aafd8c62c2a9f5e528830cf38", + "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/406c68ac9124db033d079284b719958b829cb830", + "reference": "406c68ac9124db033d079284b719958b829cb830", "shasum": "" }, "require": { "ext-openssl": "*", "php": ">= 5.4" }, - "time": "2018-09-27T13:24:13+00:00", + "time": "2018-11-15T11:59:02+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/3rdparty/vendor/robrichards/xmlseclibs/CHANGELOG.txt b/3rdparty/vendor/robrichards/xmlseclibs/CHANGELOG.txt index 62ea9cdc..a02bc7a0 100644 --- a/3rdparty/vendor/robrichards/xmlseclibs/CHANGELOG.txt +++ b/3rdparty/vendor/robrichards/xmlseclibs/CHANGELOG.txt @@ -1,5 +1,14 @@ xmlseclibs.php ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +15, Nov 2018, 3.0.3 +Bug Fixes: +- Fix casing of class name. (Willem Stuursma-Ruwen) +- Fix Xpath casing. (Tim van Dijen) + +Improvements: +- Make PCRE2 compliant. (Stefan Winter) +- Add PHP 7.3 support. (Stefan Winter) + 27, Sep 2018, 3.0.2 Security Improvements: - OpenSSL is now a requirement rather than suggestion. (Slaven Bacelic) diff --git a/3rdparty/vendor/robrichards/xmlseclibs/src/Utils/XPath.php b/3rdparty/vendor/robrichards/xmlseclibs/src/Utils/XPath.php index 11e51fb6..8cdc48e1 100644 --- a/3rdparty/vendor/robrichards/xmlseclibs/src/Utils/XPath.php +++ b/3rdparty/vendor/robrichards/xmlseclibs/src/Utils/XPath.php @@ -7,7 +7,7 @@ class XPath const ALPHANUMERIC = '\w\d'; const NUMERIC = '\d'; const LETTERS = '\w'; - const EXTENDED_ALPHANUMERIC = '\w\d\s-_:\.'; + const EXTENDED_ALPHANUMERIC = '\w\d\s\-_:\.'; const SINGLE_QUOTE = '\''; const DOUBLE_QUOTE = '"'; diff --git a/3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecEnc.php b/3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecEnc.php index 8d00fa05..7a95b5e0 100644 --- a/3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecEnc.php +++ b/3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecEnc.php @@ -471,7 +471,7 @@ class XMLSecEnc } $id = substr($uri, 1); - $query = '//xmlsecenc:EncryptedKey[@Id="'.XPath::filterAttrValue($id, XPAth::DOUBLE_QUOTE).'"]'; + $query = '//xmlsecenc:EncryptedKey[@Id="'.XPath::filterAttrValue($id, XPath::DOUBLE_QUOTE).'"]'; $keyElement = $xpath->query($query)->item(0); if (!$keyElement) { throw new Exception("Unable to locate EncryptedKey with @Id='$id'."); diff --git a/3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecurityDSig.php b/3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecurityDSig.php index 9eabde07..9ae4a968 100644 --- a/3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecurityDSig.php +++ b/3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecurityDSig.php @@ -486,15 +486,15 @@ class XMLSecurityDSig $xPath = new DOMXPath($refNode->ownerDocument); if ($this->idNS && is_array($this->idNS)) { - foreach ($this->idNS AS $nspf => $ns) { + foreach ($this->idNS as $nspf => $ns) { $xPath->registerNamespace($nspf, $ns); } } $iDlist = '@Id="'.XPath::filterAttrValue($identifier, XPath::DOUBLE_QUOTE).'"'; if (is_array($this->idKeys)) { - foreach ($this->idKeys AS $idKey) { + foreach ($this->idKeys as $idKey) { $iDlist .= " or @".XPath::filterAttrName($idKey).'="'. - XPATH::filterAttrValue($identifier, XPAth::DOUBLE_QUOTE).'"'; + XPath::filterAttrValue($identifier, XPath::DOUBLE_QUOTE).'"'; } } $query = '//*['.$iDlist.']'; diff --git a/3rdparty/vendor/robrichards/xmlseclibs/xmlseclibs.php b/3rdparty/vendor/robrichards/xmlseclibs/xmlseclibs.php index b5322b8a..e3998606 100644 --- a/3rdparty/vendor/robrichards/xmlseclibs/xmlseclibs.php +++ b/3rdparty/vendor/robrichards/xmlseclibs/xmlseclibs.php @@ -37,7 +37,7 @@ * @author Robert Richards <rrichards@cdatazone.org> * @copyright 2007-2018 Robert Richards <rrichards@cdatazone.org> * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version 3.0.2 + * @version 3.0.3-dev */ $xmlseclibs_srcdir = dirname(__FILE__) . '/src/'; |