From 04055a9bc40486950a3288acf610522e767c1e27 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 17 Mar 2016 15:23:34 +0100 Subject: Additional clean-ups for PKCS #12 utilities. The pki_server_external_cert_path has been renamed to pki_server_external_certs_path to match the file name. A default pki_server_external_certs_path has been added to default.cfg. The pki pkcs12-export has been modified to export into existing PKCS #12 file by default. The pki-server instance-cert-export has been modified to accept a list of nicknames to export. https://fedorahosted.org/pki/ticket/1742 --- base/common/python/pki/nssdb.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'base/common/python') diff --git a/base/common/python/pki/nssdb.py b/base/common/python/pki/nssdb.py index 43a97146d..2fc2d420f 100644 --- a/base/common/python/pki/nssdb.py +++ b/base/common/python/pki/nssdb.py @@ -531,8 +531,10 @@ class NSSDatabase(object): finally: shutil.rmtree(tmpdir) - def export_pkcs12(self, pkcs12_file, nicknames=None, pkcs12_password=None, - pkcs12_password_file=None): + def export_pkcs12(self, pkcs12_file, + pkcs12_password=None, + pkcs12_password_file=None, + nicknames=None): tmpdir = tempfile.mkdtemp() -- cgit