summaryrefslogtreecommitdiffstats
path: root/base/java-tools/bin/pki
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-02-09 18:41:40 +0100
committerEndi S. Dewata <edewata@redhat.com>2016-02-12 23:20:45 +0100
commit709457876a6d5e4aea281a35350667492bc34df8 (patch)
tree5bedc1f1110800c945047eacc5c65e7be9e9a7e0 /base/java-tools/bin/pki
parentaa613fa272defcc8eebd4b9ef2556e61683b4e97 (diff)
downloadpki-709457876a6d5e4aea281a35350667492bc34df8.tar.gz
pki-709457876a6d5e4aea281a35350667492bc34df8.tar.xz
pki-709457876a6d5e4aea281a35350667492bc34df8.zip
Added CLIs to inspect PKCS #12 file.
The pki pkcs12-cert-find and pki pkcs12-key-find commands have been added to list the certificates and keys in a PKCS #12 file. https://fedorahosted.org/pki/ticket/1742
Diffstat (limited to 'base/java-tools/bin/pki')
-rw-r--r--base/java-tools/bin/pki9
1 files changed, 8 insertions, 1 deletions
diff --git a/base/java-tools/bin/pki b/base/java-tools/bin/pki
index 4b8e69a55..ce322a2ec 100644
--- a/base/java-tools/bin/pki
+++ b/base/java-tools/bin/pki
@@ -29,10 +29,16 @@ def run_java_cli(args):
# read RESTEasy library path
value = subprocess.check_output(
- '. /etc/pki/pki.conf && echo $RESTEASY_LIB',
+ '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $RESTEASY_LIB',
shell=True)
resteasy_lib = value.decode(sys.getfilesystemencoding()).strip()
+ # read logging configuration path
+ value = subprocess.check_output(
+ '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $LOGGING_CONFIG',
+ shell=True)
+ logging_config = value.decode(sys.getfilesystemencoding()).strip()
+
# construct classpath
classpath = [
'/usr/share/java/commons-cli.jar',
@@ -71,6 +77,7 @@ def run_java_cli(args):
'java',
'-cp',
':'.join(classpath),
+ '-Djava.util.logging.config.file=' + logging_config,
'com.netscape.cmstools.cli.MainCLI'
]