diff options
| author | Rob Austein <sra@hactrn.net> | 2015-10-19 03:36:42 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-10-19 03:36:42 +0000 |
| commit | 7f5e75188ad4527e3c3425a155dfed0847a389dd (patch) | |
| tree | 400301cae01f51141e380664cf0b382b8204a00d /rpki/irdb/models.py | |
| parent | 7ab6040f7eb05a7ac4424e0294d228256e9a64dd (diff) | |
Amputate old SQL code out of rpkid with a fire axe, replacing it with
Django ORM. Duct tape and bailing wire everywhere, much clean-up left
to do, but basic "make yamltest" suite runs. Much of the clean-up
isn't worth doing until after revamping the I/O system, as it'll all
change again at that point anyway.
svn path=/branches/tk705/; revision=6127
Diffstat (limited to 'rpki/irdb/models.py')
| -rw-r--r-- | rpki/irdb/models.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rpki/irdb/models.py b/rpki/irdb/models.py index 0911d7aa..d2d6256b 100644 --- a/rpki/irdb/models.py +++ b/rpki/irdb/models.py @@ -33,7 +33,7 @@ import rpki.resource_set import socket import rpki.POW -from rpki.fields import EnumField, SundialField, CertificateField, DERField, KeyField, CRLField, PKCS10Field +from rpki.fields import EnumField, SundialField, CertificateField, DERField, RSAPrivateKeyField, CRLField, PKCS10Field ## @var ip_version_choices # Choice argument for fields implementing IP version numbers. @@ -139,7 +139,7 @@ class ResourceHolderEEManager(CertificateManager): class CA(django.db.models.Model): certificate = CertificateField() - private_key = KeyField() + private_key = RSAPrivateKeyField() latest_crl = CRLField() # Might want to bring these into line with what rpkid does. Current @@ -299,7 +299,7 @@ class ResourceHolderRevocation(Revocation): issuer = django.db.models.ForeignKey(ResourceHolderCA, related_name = "revocations") class EECertificate(Certificate): - private_key = KeyField() + private_key = RSAPrivateKeyField() class Meta: abstract = True |