From 3703062ab25a7817581eefa2f89214e8a6244bee Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 28 Sep 2010 23:10:25 -0400 Subject: 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 --- ipapython/certdb.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ipapython') 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): """ -- cgit