Skip to content

Commit 0b0ddcc

Browse files
schiessleschiessle
authored
Merge pull request #302 from nextcloud/bump/xmlseclibs/3.0.3
Bump xmlseclibs to 3.0.3
2 parents bfc725b + 6c500e1 commit 0b0ddcc

8 files changed

Lines changed: 39 additions & 65 deletions

File tree

‎3rdparty/vendor/composer/ClassLoader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public function isClassMapAuthoritative()
279279
*/
280280
public function setApcuPrefix($apcuPrefix)
281281
{
282-
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
282+
$this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
283283
}
284284

285285
/**

‎3rdparty/vendor/composer/LICENSE‎

Lines changed: 17 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,21 @@
1-
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2-
Upstream-Name: Composer
3-
Upstream-Contact: Jordi Boggiano <j.boggiano@seld.be>
4-
Source: https://github.com/composer/composer
51

6-
Files: *
7-
Copyright: 2016, Nils Adermann <naderman@naderman.de>
8-
2016, Jordi Boggiano <j.boggiano@seld.be>
9-
License: Expat
2+
Copyright (c) Nils Adermann, Jordi Boggiano
103

11-
Files: src/Composer/Util/TlsHelper.php
12-
Copyright: 2016, Nils Adermann <naderman@naderman.de>
13-
2016, Jordi Boggiano <j.boggiano@seld.be>
14-
2013, Evan Coury <me@evancoury.com>
15-
License: Expat and BSD-2-Clause
4+
Permission is hereby granted, free of charge, to any person obtaining a copy
5+
of this software and associated documentation files (the "Software"), to deal
6+
in the Software without restriction, including without limitation the rights
7+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is furnished
9+
to do so, subject to the following conditions:
1610

17-
License: BSD-2-Clause
18-
Redistribution and use in source and binary forms, with or without modification,
19-
are permitted provided that the following conditions are met:
20-
.
21-
* Redistributions of source code must retain the above copyright notice,
22-
this list of conditions and the following disclaimer.
23-
.
24-
* Redistributions in binary form must reproduce the above copyright notice,
25-
this list of conditions and the following disclaimer in the documentation
26-
and/or other materials provided with the distribution.
27-
.
28-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
29-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
30-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
31-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
32-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
33-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
34-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
35-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
36-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
37-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11+
The above copyright notice and this permission notice shall be included in all
12+
copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20+
THE SOFTWARE.
3821

39-
License: Expat
40-
Permission is hereby granted, free of charge, to any person obtaining a copy
41-
of this software and associated documentation files (the "Software"), to deal
42-
in the Software without restriction, including without limitation the rights
43-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
44-
copies of the Software, and to permit persons to whom the Software is furnished
45-
to do so, subject to the following conditions:
46-
.
47-
The above copyright notice and this permission notice shall be included in all
48-
copies or substantial portions of the Software.
49-
.
50-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
51-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
52-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
53-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
54-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
55-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
56-
THE SOFTWARE.

‎3rdparty/vendor/composer/installed.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,24 +98,24 @@
9898
},
9999
{
100100
"name": "robrichards/xmlseclibs",
101-
"version": "3.0.2",
102-
"version_normalized": "3.0.2.0",
101+
"version": "3.0.3",
102+
"version_normalized": "3.0.3.0",
103103
"source": {
104104
"type": "git",
105105
"url": "https://github.com/robrichards/xmlseclibs.git",
106-
"reference": "1f4de0c0d121922aafd8c62c2a9f5e528830cf38"
106+
"reference": "406c68ac9124db033d079284b719958b829cb830"
107107
},
108108
"dist": {
109109
"type": "zip",
110-
"url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/1f4de0c0d121922aafd8c62c2a9f5e528830cf38",
111-
"reference": "1f4de0c0d121922aafd8c62c2a9f5e528830cf38",
110+
"url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/406c68ac9124db033d079284b719958b829cb830",
111+
"reference": "406c68ac9124db033d079284b719958b829cb830",
112112
"shasum": ""
113113
},
114114
"require": {
115115
"ext-openssl": "*",
116116
"php": ">= 5.4"
117117
},
118-
"time": "2018-09-27T13:24:13+00:00",
118+
"time": "2018-11-15T11:59:02+00:00",
119119
"type": "library",
120120
"installation-source": "dist",
121121
"autoload": {

‎3rdparty/vendor/robrichards/xmlseclibs/CHANGELOG.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
xmlseclibs.php
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
3+
15, Nov 2018, 3.0.3
4+
Bug Fixes:
5+
- Fix casing of class name. (Willem Stuursma-Ruwen)
6+
- Fix Xpath casing. (Tim van Dijen)
7+
8+
Improvements:
9+
- Make PCRE2 compliant. (Stefan Winter)
10+
- Add PHP 7.3 support. (Stefan Winter)
11+
312
27, Sep 2018, 3.0.2
413
Security Improvements:
514
- OpenSSL is now a requirement rather than suggestion. (Slaven Bacelic)

‎3rdparty/vendor/robrichards/xmlseclibs/src/Utils/XPath.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class XPath
77
const ALPHANUMERIC = '\w\d';
88
const NUMERIC = '\d';
99
const LETTERS = '\w';
10-
const EXTENDED_ALPHANUMERIC = '\w\d\s-_:\.';
10+
const EXTENDED_ALPHANUMERIC = '\w\d\s\-_:\.';
1111

1212
const SINGLE_QUOTE = '\'';
1313
const DOUBLE_QUOTE = '"';

‎3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecEnc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ public static function staticLocateKeyInfo($objBaseKey=null, $node=null)
471471
}
472472
$id = substr($uri, 1);
473473

474-
$query = '//xmlsecenc:EncryptedKey[@Id="'.XPath::filterAttrValue($id, XPAth::DOUBLE_QUOTE).'"]';
474+
$query = '//xmlsecenc:EncryptedKey[@Id="'.XPath::filterAttrValue($id, XPath::DOUBLE_QUOTE).'"]';
475475
$keyElement = $xpath->query($query)->item(0);
476476
if (!$keyElement) {
477477
throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");

‎3rdparty/vendor/robrichards/xmlseclibs/src/XMLSecurityDSig.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,15 +486,15 @@ public function processRefNode($refNode)
486486

487487
$xPath = new DOMXPath($refNode->ownerDocument);
488488
if ($this->idNS && is_array($this->idNS)) {
489-
foreach ($this->idNS AS $nspf => $ns) {
489+
foreach ($this->idNS as $nspf => $ns) {
490490
$xPath->registerNamespace($nspf, $ns);
491491
}
492492
}
493493
$iDlist = '@Id="'.XPath::filterAttrValue($identifier, XPath::DOUBLE_QUOTE).'"';
494494
if (is_array($this->idKeys)) {
495-
foreach ($this->idKeys AS $idKey) {
495+
foreach ($this->idKeys as $idKey) {
496496
$iDlist .= " or @".XPath::filterAttrName($idKey).'="'.
497-
XPATH::filterAttrValue($identifier, XPAth::DOUBLE_QUOTE).'"';
497+
XPath::filterAttrValue($identifier, XPath::DOUBLE_QUOTE).'"';
498498
}
499499
}
500500
$query = '//*['.$iDlist.']';

‎3rdparty/vendor/robrichards/xmlseclibs/xmlseclibs.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @author Robert Richards <rrichards@cdatazone.org>
3838
* @copyright 2007-2018 Robert Richards <rrichards@cdatazone.org>
3939
* @license http://www.opensource.org/licenses/bsd-license.php BSD License
40-
* @version 3.0.2
40+
* @version 3.0.3-dev
4141
*/
4242

4343
$xmlseclibs_srcdir = dirname(__FILE__) . '/src/';

0 commit comments

Comments
 (0)