mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-11-15 09:54:10 +00:00
Merge branch '3.0'
This commit is contained in:
commit
0448d3b07b
@ -1031,7 +1031,10 @@ abstract class ASN1
|
|||||||
case self::TYPE_GENERALIZED_TIME:
|
case self::TYPE_GENERALIZED_TIME:
|
||||||
$format = $mapping['type'] == self::TYPE_UTC_TIME ? 'y' : 'Y';
|
$format = $mapping['type'] == self::TYPE_UTC_TIME ? 'y' : 'Y';
|
||||||
$format.= 'mdHis';
|
$format.= 'mdHis';
|
||||||
|
// if $source does _not_ include timezone information within it then assume that the timezone is GMT
|
||||||
$date = new DateTime($source, new DateTimeZone('GMT'));
|
$date = new DateTime($source, new DateTimeZone('GMT'));
|
||||||
|
// if $source _does_ include timezone information within it then convert the time to GMT
|
||||||
|
$date->setTimezone(new DateTimeZone('GMT'));
|
||||||
$value = $date->format($format) . 'Z';
|
$value = $date->format($format) . 'Z';
|
||||||
break;
|
break;
|
||||||
case self::TYPE_BIT_STRING:
|
case self::TYPE_BIT_STRING:
|
||||||
|
Loading…
Reference in New Issue
Block a user