diff options
author | Rob Austein <sra@hactrn.net> | 2012-10-26 02:57:36 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2012-10-26 02:57:36 +0000 |
commit | 352e7b86cff4df11423871333b51b6c730dd9cbf (patch) | |
tree | 173b5529ca89bdfed5151fe3ea36505a555db203 /rpkid/rpki/x509.py | |
parent | 11c501be2e1b20a277a5920afcab8eea44aa309c (diff) |
Change POW representation of UTCTime and GeneralizedTime to use Python
datetime instead of OpenSSL-like GeneralizedTime strings.
Clean up a lot of compiler warnings that gcc only reports with -Wextra.
svn path=/branches/tk274/; revision=4791
Diffstat (limited to 'rpkid/rpki/x509.py')
-rw-r--r-- | rpkid/rpki/x509.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py index adfcceea..6f28e6f7 100644 --- a/rpkid/rpki/x509.py +++ b/rpkid/rpki/x509.py @@ -561,13 +561,13 @@ class X509(DER_object): """ Get the inception time of this certificate. """ - return rpki.sundial.datetime.fromGeneralizedTime(self.get_POW().getNotBefore()) + return self.get_POW().getNotBefore() def getNotAfter(self): """ Get the expiration time of this certificate. """ - return rpki.sundial.datetime.fromGeneralizedTime(self.get_POW().getNotAfter()) + return self.get_POW().getNotAfter() def getSerial(self): """ @@ -1179,7 +1179,7 @@ class CMS_object(DER_object): """ Extract signingTime from CMS signed attributes. """ - return rpki.sundial.datetime.fromGeneralizedTime(self.get_POW().signingTime()) + return self.get_POW().signingTime() def verify(self, ta): """ @@ -1451,13 +1451,13 @@ class SignedManifest(DER_CMS_object): """ Get thisUpdate value from this manifest. """ - return rpki.sundial.datetime.fromGeneralizedTime(self.get_POW().getThisUpdate()) + return self.get_POW().getThisUpdate() def getNextUpdate(self): """ Get nextUpdate value from this manifest. """ - return rpki.sundial.datetime.fromGeneralizedTime(self.get_POW().getNextUpdate()) + return self.get_POW().getNextUpdate() @classmethod def build(cls, serial, thisUpdate, nextUpdate, names_and_objs, keypair, certs, version = 0): @@ -1769,13 +1769,13 @@ class CRL(DER_object): """ Get thisUpdate value from this CRL. """ - return rpki.sundial.datetime.fromGeneralizedTime(self.get_POW().getThisUpdate()) + return self.get_POW().getThisUpdate() def getNextUpdate(self): """ Get nextUpdate value from this CRL. """ - return rpki.sundial.datetime.fromGeneralizedTime(self.get_POW().getNextUpdate()) + return self.get_POW().getNextUpdate() def getIssuer(self): """ |