Make data type of certificates more obvious/predictable internally.

For the most part certificates will be treated as being in DER format.
When we load a certificate we will generally accept it in any format but
will convert it to DER before proceeding in normalize_certificate().

This also re-arranges a bit of code to pull some certificate-specific
functions out of ipalib/plugins/service.py into ipalib/x509.py.

This also tries to use variable names to indicate what format the certificate
is in at any given point:

dercert: DER
cert: PEM
nsscert: a python-nss Certificate object
rawcert: unknown format

ticket 32

1 files changed, 1 insertions, 4 deletions

diff --git a/make-testcert b/make-testcert
index e0c3db649..8a90de1ec 100755
--- a/make-testcert
+++ b/make-testcert
@@ -83,9 +83,6 @@ def makecert(reqdir):
     api.register(client)
     api.finalize()
 
-    # This needs to be imported after the API is initialized
-    from ipalib.plugins.service import make_pem
-
     ra = rabase.rabase()
     if not os.path.exists(ra.sec_dir) and api.env.xmlrpc_uri == 'http://localhost:8888/ipa/xml':
         sys.exit('The in-tree self-signed CA is not configured, see tests/test_xmlrpc/test_cert.py')
@@ -108,7 +105,7 @@ def makecert(reqdir):
     try:
         res = api.Backend.client.run('cert_request', csr, principal=princ,
             add=True)
-        cert = make_pem(res['result']['certificate'])
+        cert = x509.make_pem(res['result']['certificate'])
         fd = open(CERTPATH, 'w')
         fd.write(cert)
         fd.close()