diff options
| author | Rob Austein <sra@hactrn.net> | 2015-10-07 06:39:42 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-10-07 06:39:42 +0000 |
| commit | 63b42d248311fda78e2dc849d8cca0ced7976c82 (patch) | |
| tree | e4a79471274e399f64cd3b85f1cd5fbe99847549 /rpki | |
| parent | 4140eef6ad90cf9043efa3d3b695df142d24b4c3 (diff) | |
Apparently I broke router certificate generation on this branch a while ago and didn't notice.
svn path=/branches/tk705/; revision=6097
Diffstat (limited to 'rpki')
| -rw-r--r-- | rpki/rpkid.py | 6 | ||||
| -rw-r--r-- | rpki/rpkid_tasks.py | 4 | ||||
| -rw-r--r-- | rpki/x509.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/rpki/rpkid.py b/rpki/rpkid.py index 267a95b1..478c46bd 100644 --- a/rpki/rpkid.py +++ b/rpki/rpkid.py @@ -2352,10 +2352,12 @@ class ee_cert_obj(rpki.sql.sql_persistent): cn, sn = subject_name.extract_cn_and_sn() ca = ca_detail.ca + sia = (None, None, ca_detail.ca.sia_uri + subject_key.gSKI() + ".cer", rpki.publication.rrdp_sia_uri_kludge) + cert = ca_detail.issue_ee( ca = ca, subject_key = subject_key, - sia = None, + sia = sia, resources = resources, notAfter = resources.valid_until, cn = cn, @@ -2467,7 +2469,7 @@ class ee_cert_obj(rpki.sql.sql_persistent): ca = ca_detail.ca, subject_key = self.cert.getPublicKey(), eku = self.cert.get_EKU(), - sia = None, + sia = (None, None, self.uri, rpki.publication.rrdp_sia_uri_kludge), resources = resources, notAfter = resources.valid_until, cn = cn, diff --git a/rpki/rpkid_tasks.py b/rpki/rpkid_tasks.py index c43d3283..30e57ae8 100644 --- a/rpki/rpkid_tasks.py +++ b/rpki/rpkid_tasks.py @@ -621,7 +621,7 @@ class UpdateEECertificatesTask(AbstractTask): ee.revoke(publisher = publisher) subject_name = rpki.x509.X501DN.from_cn(r_pdu.get("cn"), r_pdu.get("sn")) - subject_key = rpki.x509.PKCS10(Base64 = r_pdu.text).getPublicKey() + subject_key = rpki.x509.PKCS10(Base64 = r_pdu[0].text).getPublicKey() for ca_detail in covering: logger.debug("No existing EE certificate for %s %s", @@ -632,7 +632,7 @@ class UpdateEECertificatesTask(AbstractTask): subject_key = subject_key, resources = resources, publisher = publisher, - eku = r_pdu.eku or None) + eku = r_pdu.get("eku", "").split(",") or None) # Anything left is an orphan for ees in existing.values(): diff --git a/rpki/x509.py b/rpki/x509.py index 61022520..686ddf88 100644 --- a/rpki/x509.py +++ b/rpki/x509.py @@ -775,7 +775,7 @@ class X509(DER_object): if not sia or len(sia) != 4 or not sia[3]: logger.debug("Oops! _issue() sia: %r", sia) - log.show_stack(logger) + rpki.log.show_stack(logger) now = rpki.sundial.now() ski = subject_key.get_SKI() |