summaryrefslogtreecommitdiffstats
path: root/apps/lib
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-08-16 15:25:27 +0200
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-08-20 14:55:52 +0200
commit2a33470b4f23bcf1cd66bbf645c855142efa0ed9 (patch)
tree5b739438019058a19ede7530679a1b4fd4e75b3c /apps/lib
parentb3c5aadf4ce3dc2207cc605726bf370a55b531c9 (diff)
Make better use of new load_cert_pass() variant of load_cert() in apps/
allows loading password-protected PKCS#12 files in x509, ca, s_client, s_server Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12647)
Diffstat (limited to 'apps/lib')
-rw-r--r--apps/lib/apps.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index b2e29917eb..150df997b8 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -501,12 +501,6 @@ X509 *load_cert_pass(const char *uri, int maybe_stdin,
}
/* the format parameter is meanwhile not needed anymore and thus ignored */
-X509 *load_cert(const char *uri, int format, const char *desc)
-{
- return load_cert_pass(uri, 1, NULL, desc);
-}
-
-/* the format parameter is meanwhile not needed anymore and thus ignored */
X509_CRL *load_crl(const char *uri, int format, const char *desc)
{
X509_CRL *crl = NULL;