danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-12-10 07:58:54 +01:00
Code Issues Projects Releases Wiki Activity

X509: tweaks to mapOutExtensions

Browse Source
This commit is contained in:
terrafrost 2021-04-20 16:01:45 -05:00
parent c596078d7a
commit 7d3b0a2182
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpseclib/File/X509.php
View File

@ -670,7 +670,7 @@ class X509
*/ */
private function mapOutExtensions(&$root, $path) private function mapOutExtensions(&$root, $path)
{ {
$extensions = &$this->subArray($root, $path, true); $extensions = &$this->subArray($root, $path, !empty($this->extensionValues));
foreach ($this->extensionValues as $id => $data) { foreach ($this->extensionValues as $id => $data) {
extract($data); extract($data);
@ -679,16 +679,15 @@ class X509
'extnValue' => $value, 'extnValue' => $value,
'critical' => $critical 'critical' => $critical
]; ];
if (!$replace) { if ($replace) {
$extensions[] = $newext; foreach ($extensions as $key => $value) {
continue; if ($value['extnId'] == $id) {
} $extensions[$key] = $newext;
foreach ($extensions as $key => $value) { continue 2;
if ($value['extnId'] == $id) { }
$extensions[$key] = $newext; }
break;
}
} }
$extensions[] = $newext;
} }
if (is_array($extensions)) { if (is_array($extensions)) {