Clean up existing DN object usage

This commit is contained in:
John Dennis
2011-07-28 14:32:26 -04:00
committed by Martin Kosek
parent 44b3521fad
commit 442973edc5
5 changed files with 19 additions and 24 deletions

View File

@@ -933,7 +933,7 @@ class CAInstance(service.Service):
st = 1
en = 0
subid = 0
normalized_base = str(DN(self.subject_base))
ca_dn = DN(('CN','Certificate Authority'), self.subject_base)
while st > 0:
st = certlist.find('-----BEGIN', en)
en = certlist.find('-----END', en+1)
@@ -942,11 +942,11 @@ class CAInstance(service.Service):
(chain_fd, chain_name) = tempfile.mkstemp()
os.write(chain_fd, certlist[st:en+25])
os.close(chain_fd)
(rdn, subject) = certs.get_cert_nickname(certlist[st:en+25])
if subject.lower() == ('CN=Certificate Authority,%s' % normalized_base).lower():
(rdn, subject_dn) = certs.get_cert_nickname(certlist[st:en+25])
if subject_dn == ca_dn:
nick = get_ca_nickname(self.realm)
else:
nick = subject
nick = str(subject_dn)
self.__run_certutil(
['-A', '-t', 'CT,C,C', '-n', nick, '-a',
'-i', chain_name]