diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-09-28 23:10:25 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-10-01 13:37:34 -0400 |
| commit | 3703062ab25a7817581eefa2f89214e8a6244bee (patch) | |
| tree | 469a4abc1eea4dadac459e28936fe7e117e8808a /ipapython | |
| parent | 3127df2aee8ad8ef95f34610665a004fece51acf (diff) | |
| download | freeipa-3703062ab25a7817581eefa2f89214e8a6244bee.tar.gz freeipa-3703062ab25a7817581eefa2f89214e8a6244bee.tar.xz freeipa-3703062ab25a7817581eefa2f89214e8a6244bee.zip | |
Use consistent, specific nickname for the IPA CA certificate.
Also fix some imports for sha. We have a compat module for it, use it.
ticket 181
Diffstat (limited to 'ipapython')
| -rw-r--r-- | ipapython/certdb.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipapython/certdb.py b/ipapython/certdb.py index fb99e25ac..a2fbb0ec3 100644 --- a/ipapython/certdb.py +++ b/ipapython/certdb.py @@ -21,10 +21,12 @@ from ipapython import ipautil from ipapython import nsslib from ipalib import pkcs10 import tempfile -import sha +from ipalib.compat import sha1 import shutil import os +CA_NICKNAME = "IPA CA" + class CertDB(object): """ To be used for temporary NSS databases only. If temporary is set then @@ -64,7 +66,7 @@ class CertDB(object): return ipautil.run(new_args, stdin) def generate_random(self): - return sha.sha(ipautil.ipa_generate_password()).hexdigest() + return sha1(ipautil.ipa_generate_password()).hexdigest() def create_noise_file(self): """ |