danog/tgseclib
1
0
Fork 0
mirror of https://github.com/danog/tgseclib.git synced 2024-12-12 09:09:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into php5

Browse Source
This commit is contained in:
terrafrost 2014-03-29 15:28:50 -05:00
commit a9bdce9469
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpseclib/File/X509.php
View File

@ -3132,9 +3132,9 @@ class File_X509
{ {
$year = @gmdate("Y", @strtotime($date)); // the same way ASN1.php parses this $year = @gmdate("Y", @strtotime($date)); // the same way ASN1.php parses this
if ($year < 2050) { if ($year < 2050) {
return Array('utcTime' => $date); return array('utcTime' => $date);
} else { } else {
return Array('generalTime' => $date); return array('generalTime' => $date);
} }
} }