summaryrefslogtreecommitdiff
path: root/tools/extract.c
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2013-02-01 12:02:16 +0100
committerStef Walter <stefw@gnome.org>2013-02-05 15:00:25 +0100
commit08f1a7f3cfe87bc19ecd564711b4d2beaa603924 (patch)
treebbaf0097b65c6210ef0b0e0363330deae23b810a /tools/extract.c
parent32ca4f6d3167d08fc985d66fe48f453954596f87 (diff)
Implement support for java JKS keystore format
* All aliases must be lower case in order to work with the default keystore implementation.
Diffstat (limited to 'tools/extract.c')
-rw-r--r--tools/extract.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/extract.c b/tools/extract.c
index 19b6c21..abbb300 100644
--- a/tools/extract.c
+++ b/tools/extract.c
@@ -177,6 +177,7 @@ format_argument (const char *optarg,
{ "x509-directory", p11_extract_x509_directory, },
{ "pem-bundle", p11_extract_pem_bundle, },
{ "pem-directory", p11_extract_pem_directory },
+ { "java-cacerts", p11_extract_jks_cacerts },
{ "openssl-bundle", p11_extract_openssl_bundle },
{ "openssl-directory", p11_extract_openssl_directory },
{ NULL },
@@ -359,7 +360,8 @@ p11_tool_extract (int argc,
" pem-bundle file containing multiple PEM blocks\n"
" pem-directory directory of PEM files\n"
" openssl-bundle OpenSSL specific PEM bundle\n"
- " openssl-directory directory of OpenSSL specific files",
+ " openssl-directory directory of OpenSSL specific files\n"
+ " java-cacerts java keystore cacerts file",
"type"
},
{ opt_purpose,