Merge pull request #273 from vollkorntomate/master

Add support for GeneralizedTime (#235)

Author: andrivet

examples/dump.py

@@ -48,6 +48,7 @@ def read_pem(input_file):
     asn1.Numbers.PrintableString: "PRINTABLESTRING",
     asn1.Numbers.IA5String: "IA5STRING",
     asn1.Numbers.UTCTime: "UTCTIME",
+    asn1.Numbers.GeneralizedTime: "GENERALIZED TIME",
     asn1.Numbers.Enumerated: "ENUMERATED",
     asn1.Numbers.Sequence: "SEQUENCE",
     asn1.Numbers.Set: "SET"

src/asn1.py

@@ -42,6 +42,7 @@ class Numbers(IntEnum):
     PrintableString = 0x13
     IA5String = 0x16
     UTCTime = 0x17
+    GeneralizedTime = 0x18
     UnicodeString = 0x1e
 
 
@@ -269,7 +270,8 @@ def _encode_value(self, cls, nr, value):  # type: (int, int, any) -> bytes
             return self._encode_integer(value)
         if nr in (Numbers.OctetString, Numbers.PrintableString,
                   Numbers.UTF8String, Numbers.IA5String,
-                  Numbers.UnicodeString, Numbers.UTCTime):
+                  Numbers.UnicodeString, Numbers.UTCTime,
+                  Numbers.GeneralizedTime):
             return self._encode_octet_string(value)
         if nr == Numbers.BitString:
             return self._encode_bit_string(value)
@@ -544,7 +546,9 @@ def _read_value(self, cls, nr, length):  # type: (int, int, int) -> any
             value = self._decode_null(bytes_data)
         elif nr == Numbers.ObjectIdentifier:
             value = self._decode_object_identifier(bytes_data)
-        elif nr in (Numbers.PrintableString, Numbers.IA5String, Numbers.UTF8String, Numbers.UTCTime):
+        elif nr in (Numbers.PrintableString, Numbers.IA5String, 
+                    Numbers.UTF8String, Numbers.UTCTime,
+                    Numbers.GeneralizedTime):
             value = self._decode_printable_string(bytes_data)
         elif nr == Numbers.BitString:
             value = self._decode_bitstring(bytes_data)

tests/test_asn1.py

@@ -1082,6 +1082,18 @@ def test_utc_time(self):
         ):
             TestEncoderDecoder.assert_encode_decode(v, asn1.Numbers.UTCTime)
 
+    def test_generalized_time(self):
+        for v in \
+        (
+            '19920521000000Z',
+            '19920622123421.123Z',
+            '20920722132100-0500',
+            '20920722132100+0200',
+            '20920722132100.123-0500',
+            '20920722132100.123+0200',
+        ):
+            TestEncoderDecoder.assert_encode_decode(v, asn1.Numbers.GeneralizedTime)
+
     def test_unicode_string(self):
         for v in \
         (