Merge branch '2.0' into 3.0

This commit is contained in:
terrafrost 2021-05-23 10:39:25 -05:00
commit d0a18020f3

View File

@ -1477,7 +1477,7 @@ abstract class ASN1
$temp = $str;
} else {
$temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
$temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $str, 1);
$temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $temp, 1);
}
// remove new lines
$temp = str_replace(["\r", "\n", ' '], '', $temp);