[Pki-devel] [PATCH] 669 Merged pki.nss into pki.crypto.

[Endi Sukma Dewata]

On 1/22/2016 9:57 AM, Endi Sukma Dewata wrote:
> The pki.nss module has been merged into pki.crypto to prevent
> conflicts with nss module.
>
> https://fedorahosted.org/pki/ticket/456

Renamed pki.nss to pki.nssdb instead per Christian's feedback.

-- 
Endi S. Dewata
-------------- next part --------------
>From 0cbd26ec5c1c8e34601eb2f07c23f84da073289b Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata at redhat.com>
Date: Fri, 22 Jan 2016 17:34:19 +0100
Subject: [PATCH] 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
---
 base/common/python/pki/{nss.py => nssdb.py}                         | 0
 base/server/python/pki/server/__init__.py                           | 4 ++--
 base/server/python/pki/server/cli/subsystem.py                      | 6 +++---
 .../server/python/pki/server/deployment/scriptlets/configuration.py | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename base/common/python/pki/{nss.py => nssdb.py} (100%)

diff --git a/base/common/python/pki/nss.py b/base/common/python/pki/nssdb.py
similarity index 100%
rename from base/common/python/pki/nss.py
rename to 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 98b7d97bfaf237d97bda1246ac9a26fde1c70402..604a56e7a630b19b01016c111faa0d8934b70e2e 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'
@@ -328,7 +328,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 d033142f5be2a221a30b9b750da80a3143b79574..1be91b10e65f3185414976a6de63ff5c9e37d986 100644
--- a/base/server/python/pki/server/cli/subsystem.py
+++ b/base/server/python/pki/server/cli/subsystem.py
@@ -28,7 +28,7 @@ import string
 import sys
 
 import pki.cli
-import pki.nss
+import pki.nssdb
 import pki.server
 
 
@@ -537,13 +537,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 a5ab3f88b6c74de7acf8ca6224c87a71e1211c08..5ec46c86f9a27e90745bc74e83039467d46540e7 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.
-- 
2.4.3