diff options
author | Adam Williamson <awilliam@redhat.com> | 2015-01-13 20:52:20 -0800 |
---|---|---|
committer | Stef Walter <stefw@redhat.com> | 2015-01-14 13:36:47 +0100 |
commit | a6df1f21e42a3b57448eb6897b976ac8883908eb (patch) | |
tree | 78d0379a31c7370907086535c4fe1cc2159991ff /trust/extract.c | |
parent | b65e3148a8ea2d54b17a8be617bbdcb026c49fcd (diff) |
trust: Add pem-directory-hash extract format
This allows extraction of a directory of standard PEM files
with the OpenSSL hash symlinks; this is a format used by
some popular platforms (Debian's /etc/ssl/certs is in this
form, and OpenSUSE provides it for compatibility).
Initially by: Ludwig Nussel <ludwig.nussel@suse.de>
Signed-off-by: Stef Walter <stefw@redhat.com>
* Added header, fixed compiler warnings
Diffstat (limited to 'trust/extract.c')
-rw-r--r-- | trust/extract.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/trust/extract.c b/trust/extract.c index a008270..80b5e72 100644 --- a/trust/extract.c +++ b/trust/extract.c @@ -44,6 +44,7 @@ #include "pkcs11x.h" #include "save.h" #include "tool.h" +#include "digest.h" #include "p11-kit/iter.h" #include "p11-kit/pkcs11.h" @@ -77,6 +78,7 @@ format_argument (const char *optarg, { "x509-directory", p11_extract_x509_directory, }, { "pem-bundle", p11_extract_pem_bundle, }, { "pem-directory", p11_extract_pem_directory }, + { "pem-directory-hash", p11_extract_pem_directory_hash }, { "java-cacerts", p11_extract_jks_cacerts }, { "openssl-bundle", p11_extract_openssl_bundle }, { "openssl-directory", p11_extract_openssl_directory }, @@ -198,13 +200,14 @@ p11_trust_extract (int argc, }, { opt_format, "format to extract to\n" - " x509-file DER X.509 certificate file\n" - " x509-directory directory of X.509 certificates\n" - " 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\n" - " java-cacerts java keystore cacerts file", + " x509-file DER X.509 certificate file\n" + " x509-directory directory of X.509 certificates\n" + " pem-bundle file containing multiple PEM blocks\n" + " pem-directory directory of PEM files\n" + " pem-directory-hash directory of PEM files with hash links\n" + " openssl-bundle OpenSSL specific PEM bundle\n" + " openssl-directory directory of OpenSSL specific files\n" + " java-cacerts java keystore cacerts file", "type" }, { opt_purpose, |