aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2011-06-14 13:55:20 +0000
committerMichael Elkins <melkins@tislabs.com>2011-06-14 13:55:20 +0000
commita0665e1bd1ab3b1fa36109763f1b8008c655e430 (patch)
tree159a77f3a16d4e39cc4e32b245770c2f64184fd6
parente27d6bd7ef9b4625bdd0c5f8762ab16ee0801a27 (diff)
properly handle the self-signed TAs
svn path=/rpkid/portal-gui/scripts/rpkigui-rcynic.py; revision=3870
-rw-r--r--rpkid/portal-gui/scripts/rpkigui-rcynic.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
index 72ef5918..d824d984 100644
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
@@ -59,11 +59,15 @@ def process_object(obj, model_class):
inst.not_after = obj.notAfter.to_sql()
# look up signing cert
- q = models.Cert.objects.filter(keyid=obj.aki)
- if q:
- inst.issuer = q[0]
+ if obj.issuer == obj.subject:
+ # self-signed cert (TA)
+ inst.cert = inst
else:
- sys.stderr.write('warning: unable to find signing cert with ski=%s (%s)\n' % (obj.aki, obj.issuer))
+ q = models.Cert.objects.filter(keyid=obj.aki)
+ if q:
+ inst.issuer = q[0]
+ else:
+ sys.stderr.write('warning: unable to find signing cert with ski=%s (%s)\n' % (obj.aki, obj.issuer))
return True, inst
elif debug: