diff options
Diffstat (limited to 'rpki')
| -rw-r--r-- | rpki/rpkid_tasks.py | 5 | ||||
| -rw-r--r-- | rpki/rpkidb/models.py | 2 | ||||
| -rw-r--r-- | rpki/x509.py | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/rpki/rpkid_tasks.py b/rpki/rpkid_tasks.py index 9759deff..9fe193ae 100644 --- a/rpki/rpkid_tasks.py +++ b/rpki/rpkid_tasks.py @@ -586,13 +586,10 @@ class UpdateEECertificatesTask(AbstractTask): for ca_detail in covering: logger.debug("%r: No existing EE certificate for %s %s", self, gski, resources) cn, sn = subject_name.extract_cn_and_sn() - sia = (None, None, - ca_detail.ca.sia_uri + subject_key.gSKI() + ".cer", - ca_detail.ca.parent.repository.rrdp_notification_uri) cert = ca_detail.issue_ee( ca = ca_detail.ca, subject_key = subject_key, - sia = sia, + sia = None, resources = resources, notAfter = resources.valid_until, cn = cn, diff --git a/rpki/rpkidb/models.py b/rpki/rpkidb/models.py index c2488738..5fd5785f 100644 --- a/rpki/rpkidb/models.py +++ b/rpki/rpkidb/models.py @@ -1845,7 +1845,7 @@ class EECertificate(models.Model): ca = ca_detail.ca, subject_key = self.cert.getPublicKey(), eku = self.cert.get_EKU(), - sia = (None, None, self.uri, ca_detail.ca.parent.repository.rrdp_notification_uri), + sia = None, resources = resources, notAfter = resources.valid_until, cn = cn, diff --git a/rpki/x509.py b/rpki/x509.py index 67a597e6..0acb3859 100644 --- a/rpki/x509.py +++ b/rpki/x509.py @@ -776,9 +776,9 @@ class X509(DER_object): Common code to issue an RPKI certificate. """ - assert sia and len(sia) == 4 and sia[3] - - sia = tuple((str(s),) if isinstance(s, (str, unicode)) else s for s in sia) + if sia is not None: + assert len(sia) == 4 and sia[3] + sia = tuple((str(s),) if isinstance(s, (str, unicode)) else s for s in sia) now = rpki.sundial.now() ski = subject_key.get_SKI() |