diff options
Diffstat (limited to 'rpkid/rpki/x509.py')
| -rw-r--r-- | rpkid/rpki/x509.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py index a7f04304..adfcceea 100644 --- a/rpkid/rpki/x509.py +++ b/rpkid/rpki/x509.py @@ -662,8 +662,8 @@ class X509(DER_object): cert.setSerial(serial) cert.setIssuer(issuer_name.get_POW()) cert.setSubject(X501DN.from_cn(cn).get_POW()) - cert.setNotBefore(now.toGeneralizedTime()) - cert.setNotAfter(notAfter.toGeneralizedTime()) + cert.setNotBefore(now) + cert.setNotAfter(notAfter) cert.setPublicKey(subject_key.get_POW()) cert.setSKI(ski) cert.setAKI(aki) @@ -775,8 +775,8 @@ class X509(DER_object): cert.setSerial(serial) cert.setIssuer(issuer_name.get_POW()) cert.setSubject(subject_name.get_POW()) - cert.setNotBefore(now.toGeneralizedTime()) - cert.setNotAfter(notAfter.toGeneralizedTime()) + cert.setNotBefore(now) + cert.setNotAfter(notAfter) cert.setPublicKey(subject_key.get_POW()) cert.setSKI(subject_key.get_POW().calculateSKI()) if issuer_key != subject_key: @@ -1475,8 +1475,8 @@ class SignedManifest(DER_CMS_object): obj = cls.POW_class() obj.setVersion(version) obj.setManifestNumber(serial) - obj.setThisUpdate(thisUpdate.toGeneralizedTime()) - obj.setNextUpdate(nextUpdate.toGeneralizedTime()) + obj.setThisUpdate(thisUpdate) + obj.setNextUpdate(nextUpdate) obj.setAlgorithm(POWify_OID(rpki.oids.name2oid["id-sha256"])) obj.addFiles(filelist) @@ -1797,12 +1797,11 @@ class CRL(DER_object): crl = rpki.POW.CRL() crl.setVersion(version) crl.setIssuer(issuer.getSubject().get_POW()) - crl.setThisUpdate(thisUpdate.toGeneralizedTime()) - crl.setNextUpdate(nextUpdate.toGeneralizedTime()) + crl.setThisUpdate(thisUpdate) + crl.setNextUpdate(nextUpdate) crl.setAKI(issuer.get_SKI()) crl.setCRLNumber(serial) - crl.addRevocations((r[0], r[1].toGeneralizedTime()) - for r in revokedCertificates) + crl.addRevocations(revokedCertificates) crl.sign(keypair.get_POW()) return cls(POW = crl) |