From dd69c7dbe68e8f8674994a54ea913f2dd2e52c32 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 8 Jun 2011 10:54:41 -0400 Subject: 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 --- install/tools/ipa-compliance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install') diff --git a/install/tools/ipa-compliance b/install/tools/ipa-compliance index e1de2528..81cd8c37 100644 --- a/install/tools/ipa-compliance +++ b/install/tools/ipa-compliance @@ -81,7 +81,7 @@ def check_compliance(tmpdir, debug=False): api.bootstrap(**cfg) api.register(client) api.finalize() - from ipalib.plugins.service import normalize_certificate, make_pem + from ipalib.x509 import normalize_certificate, make_pem try: # Create a new credentials cache for this tool. This executes -- cgit