summaryrefslogtreecommitdiffstats
path: root/install/tools
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-06-08 10:54:41 -0400
committerRob Crittenden <rcritten@redhat.com>2011-06-21 19:09:50 -0400
commitdd69c7dbe68e8f8674994a54ea913f2dd2e52c32 (patch)
tree5fdc303354eb26a1d2cd206c81babdc73e8d51b9 /install/tools
parent3a36eced53e540fe8f2b23eadf7dffda080324de (diff)
downloadfreeipa-dd69c7dbe68e8f8674994a54ea913f2dd2e52c32.tar.gz
freeipa-dd69c7dbe68e8f8674994a54ea913f2dd2e52c32.tar.xz
freeipa-dd69c7dbe68e8f8674994a54ea913f2dd2e52c32.zip
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
Diffstat (limited to 'install/tools')
-rw-r--r--install/tools/ipa-compliance2
1 files changed, 1 insertions, 1 deletions
diff --git a/install/tools/ipa-compliance b/install/tools/ipa-compliance
index e1de25283..81cd8c370 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