diff options
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/rpki/sundial.py | 3 | ||||
| -rw-r--r-- | rpkid/rpki/x509.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/rpkid/rpki/sundial.py b/rpkid/rpki/sundial.py index fe5623b9..e8c92d5a 100644 --- a/rpkid/rpki/sundial.py +++ b/rpkid/rpki/sundial.py @@ -67,7 +67,8 @@ class datetime(pydatetime.datetime): @classmethod def fromUTCTime(cls, x): """Convert from ASN.1 UTCTime.""" - return cls.strptime(x, "%y%m%d%H%M%SZ") + x = str(x) + return cls.fromGeneralizedTime(("19" if x[0] >= "5" else "20") + x) def toUTCTime(self): """Convert to ASN.1 UTCTime.""" diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py index 317ef334..07b127b1 100644 --- a/rpkid/rpki/x509.py +++ b/rpkid/rpki/x509.py @@ -847,7 +847,7 @@ class CMS_object(DER_object): """ Extract signingTime from CMS signed attributes. """ - return rpki.sundial.datetime.fromUTCTime(self.get_POW().signingTime()) + return rpki.sundial.datetime.fromGeneralizedTime(self.get_POW().signingTime()) def verify(self, ta): """ |