Fix bug with leading fractional zeroes

sop · May 20, 2019 · bf86e8e · bf86e8e
1 parent cc0d0f4
commit bf86e8e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/ASN1/Type/Primitive/GeneralizedTime.php b/lib/ASN1/Type/Primitive/GeneralizedTime.php
@@ -109,9 +109,9 @@ protected static function _decodeFromDER(Identifier $identifier,
                 throw new DecodeException(
                     "Fractional seconds must omit trailing zeroes.");
             }
-            $frac = (int) $frac;
+            $frac = $frac;
         } else {
-            $frac = 0;
+            $frac = '0';
         }
         $time = $year . $month . $day . $hour . $minute . $second . "." . $frac .
             self::TZ_UTC;

diff --git a/test/tests/type/primitive/generalized-time/GeneralizedTimeTest.php b/test/tests/type/primitive/generalized-time/GeneralizedTimeTest.php
@@ -102,4 +102,19 @@ public function testClone(Element $el)
         $clone = clone $el;
         $this->assertInstanceOf(GeneralizedTime::class, $clone);
     }
+
+    /**
+     * Test bug where leading zeroes in fraction gets stripped,
+     * such that `.05` becomes `.5`.
+     */
+    public function testLeadingFractionZeroes()
+    {
+        $ts = strtotime('Mon Jan 2 15:04:05 MST 2006');
+        $dt = \DateTimeImmutable::createFromFormat('U.u', "{$ts}.05",
+            new \DateTimeZone('UTC'));
+        $el = new GeneralizedTime($dt);
+        $der = $el->toDER();
+        $el = GeneralizedTime::fromDER($der);
+        $this->assertEquals($der, $el->toDER());
+    }
 }