mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-17 02:35:10 +00:00
Merge branch '1.0' into 2.0
This commit is contained in:
commit
64708aed3b
@ -5054,7 +5054,9 @@ class X509
|
||||
* subject=/O=organization/OU=org unit/CN=common name
|
||||
* issuer=/O=organization/CN=common name
|
||||
*/
|
||||
$temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
|
||||
$temp = strlen($str) <= ini_get('pcre.backtrack_limit') ?
|
||||
preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1) :
|
||||
$str;
|
||||
// remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
|
||||
$temp = preg_replace('#-+[^-]+-+#', '', $temp);
|
||||
// remove new lines
|
||||
|
Loading…
Reference in New Issue
Block a user