diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-01-22 17:34:19 +0100 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-02-22 20:20:11 -0700 |
| commit | 708189e54a505ce0baf9a96ff3ad8b6a9942936e (patch) | |
| tree | b3733a9913874550bd7cd14cb17342e3334bf02d | |
| parent | 5207fe7a28462f24ba47301a717af15057f3be0e (diff) | |
| download | pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.tar.gz pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.tar.xz pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.zip | |
Renamed pki.nss into pki.nssdb.
The pki.nss module has been renamed into pki.nssdb to prevent
conflicts with the nss module.
https://fedorahosted.org/pki/ticket/456
(cherry picked from commit 9609f4e6035d3cdff19a0f78caee2d08b095c8ba)
| -rw-r--r-- | base/common/python/pki/nssdb.py (renamed from base/common/python/pki/nss.py) | 0 | ||||
| -rw-r--r-- | base/server/python/pki/server/__init__.py | 4 | ||||
| -rw-r--r-- | base/server/python/pki/server/cli/subsystem.py | 6 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/configuration.py | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/base/common/python/pki/nss.py b/base/common/python/pki/nssdb.py index 67fd90b4c..67fd90b4c 100644 --- a/base/common/python/pki/nss.py +++ b/base/common/python/pki/nssdb.py diff --git a/base/server/python/pki/server/__init__.py b/base/server/python/pki/server/__init__.py index 5942115a3..b2fffd5e6 100644 --- a/base/server/python/pki/server/__init__.py +++ b/base/server/python/pki/server/__init__.py @@ -33,7 +33,7 @@ import subprocess import tempfile import pki -import pki.nss +import pki.nssdb INSTANCE_BASE_DIR = '/var/lib/pki' REGISTRY_DIR = '/etc/sysconfig/pki' @@ -305,7 +305,7 @@ class PKIInstance(object): return password def open_nssdb(self, token='internal'): - return pki.nss.NSSDatabase( + return pki.nssdb.NSSDatabase( directory=self.nssdb_dir, token=token, password=self.get_password(token)) diff --git a/base/server/python/pki/server/cli/subsystem.py b/base/server/python/pki/server/cli/subsystem.py index cb27adc1d..3af19269b 100644 --- a/base/server/python/pki/server/cli/subsystem.py +++ b/base/server/python/pki/server/cli/subsystem.py @@ -29,7 +29,7 @@ import string import sys import pki.cli -import pki.nss +import pki.nssdb import pki.server @@ -536,13 +536,13 @@ class SubsystemCertExportCLI(pki.cli.CLI): if cert_file: - cert_data = pki.nss.convert_cert(subsystem_cert['data'], 'base64', 'pem') + cert_data = pki.nssdb.convert_cert(subsystem_cert['data'], 'base64', 'pem') with open(cert_file, 'w') as f: f.write(cert_data) if csr_file: - csr_data = pki.nss.convert_csr(subsystem_cert['request'], 'base64', 'pem') + csr_data = pki.nssdb.convert_csr(subsystem_cert['request'], 'base64', 'pem') with open(csr_file, 'w') as f: f.write(csr_data) diff --git a/base/server/python/pki/server/deployment/scriptlets/configuration.py b/base/server/python/pki/server/deployment/scriptlets/configuration.py index 16c6ae5da..54f1c6e60 100644 --- a/base/server/python/pki/server/deployment/scriptlets/configuration.py +++ b/base/server/python/pki/server/deployment/scriptlets/configuration.py @@ -28,7 +28,7 @@ from .. import pkimessages as log from .. import pkiscriptlet import pki.encoder -import pki.nss +import pki.nssdb import pki.server import pki.system import pki.util @@ -138,7 +138,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): hash_alg=hash_alg) with open(external_csr_path) as f: signing_csr = f.read() - signing_csr = pki.nss.convert_csr(signing_csr, 'pem', 'base64') + signing_csr = pki.nssdb.convert_csr(signing_csr, 'pem', 'base64') subsystem.config['ca.signing.certreq'] = signing_csr # This is needed by IPA to detect step 1 completion. @@ -153,7 +153,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): if external_csr_path: with open(external_csr_path) as f: signing_csr = f.read() - signing_csr = pki.nss.convert_csr(signing_csr, 'pem', 'base64') + signing_csr = pki.nssdb.convert_csr(signing_csr, 'pem', 'base64') subsystem.config['ca.signing.certreq'] = signing_csr # If specified, import external CA cert into NSS database. |