octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-12-25 03:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
terrafrost 2021-04-03 13:48:40 -05:00
parent 104a57badd
commit 0fc7c81c66
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpseclib/File/ASN1.php
View File

@ -452,14 +452,10 @@ abstract class ASN1
} }
break; break;
case self::TYPE_OBJECT_IDENTIFIER: case self::TYPE_OBJECT_IDENTIFIER:
<<<<<<< HEAD
$current['content'] = self::decodeOID(substr($content, $content_pos));
=======
if ($constructed) { if ($constructed) {
return false; return false;
} }
$current['content'] = $this->_decodeOID(substr($content, $content_pos)); $current['content'] = self::decodeOID(substr($content, $content_pos));
>>>>>>> moosa-2.0
if ($current['content'] === false) { if ($current['content'] === false) {
return false; return false;
} }