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
This commit is contained in:
Rob Crittenden
2010-09-28 23:10:25 -04:00
parent 3127df2aee
commit 3703062ab2
5 changed files with 14 additions and 14 deletions

View File

@@ -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):
"""