diff options
Diffstat (limited to 'rpkid/rpki/irdb')
| -rw-r--r-- | rpkid/rpki/irdb/models.py | 11 | ||||
| -rw-r--r-- | rpkid/rpki/irdb/zookeeper.py | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/rpkid/rpki/irdb/models.py b/rpkid/rpki/irdb/models.py index e29e332e..7a3c8521 100644 --- a/rpkid/rpki/irdb/models.py +++ b/rpkid/rpki/irdb/models.py @@ -583,14 +583,9 @@ class EECertificateRequest(ResourceSet): issuer = django.db.models.ForeignKey(ResourceHolderCA, related_name = "ee_certificate_requests") pkcs10 = PKCS10Field() gski = django.db.models.CharField(max_length = 27) - router_id = django.db.models.BigIntegerField(null = True) - - # Subject name isn't allowed in the PKCS #10, so we need to carry - # either a subject name or a router-id as a separate field. - # Carrying subject name would be more flexible, but is also a swamp - # if we start allowing more than just CN and SN. - # - # For the moment we just do router-id. + cn = django.db-models.CharField(max_length = 64) + sn = django.db-models.CharField(max_length = 64) + eku = django.db.models.TextField(null = True) def _select_resource_bag(self): ee_asn = rpki.irdb.EECertificateRequestASN.objects.raw(""" diff --git a/rpkid/rpki/irdb/zookeeper.py b/rpkid/rpki/irdb/zookeeper.py index 339503fb..87875fd5 100644 --- a/rpkid/rpki/irdb/zookeeper.py +++ b/rpkid/rpki/irdb/zookeeper.py @@ -1656,11 +1656,16 @@ class Zookeeper(object): pkcs10.check_valid_request_router() + cn = "ROUTER-%08x" % asns[0].min + sn = "%08x" % router_id + ee_request = self.resource_ca.ee_certificate_requests.create( pkcs10 = pkcs10, gski = pkcs10.gSKI(), valid_until = valid_until, - router_id = router_id) + cn = cn, + sn = sn, + eku = rpki.oids.id_kp_bgpsec_router) for range in asns: ee_request.asns.create(start_as = str(range.min), end_as = str(range.max)) |