diff options
author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-16 15:25:27 +0200 |
---|---|---|
committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-20 14:55:52 +0200 |
commit | 2a33470b4f23bcf1cd66bbf645c855142efa0ed9 (patch) | |
tree | 5b739438019058a19ede7530679a1b4fd4e75b3c /apps/s_client.c | |
parent | b3c5aadf4ce3dc2207cc605726bf370a55b531c9 (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/s_client.c')
-rw-r--r-- | apps/s_client.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index ba4fcdcca1..2a58589ce2 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -612,7 +612,7 @@ const OPTIONS s_client_options[] = { {"host", OPT_HOST, 's', "Use -connect instead"}, {"port", OPT_PORT, 'p', "Use -connect instead"}, {"connect", OPT_CONNECT, 's', - "TCP/IP where to connect (default is :" PORT ")"}, + "TCP/IP where to connect; default: " PORT ")"}, {"bind", OPT_BIND, 's', "bind local address for connection"}, {"proxy", OPT_PROXY, 's', "Connect to via specified proxy to the real server"}, @@ -643,9 +643,9 @@ const OPTIONS s_client_options[] = { {"cert_chain", OPT_CERT_CHAIN, '<', "Client certificate chain file (in PEM format)"}, {"build_chain", OPT_BUILD_CHAIN, '-', "Build client certificate chain"}, - {"key", OPT_KEY, 's', "Private key file to use; default is: -cert file"}, + {"key", OPT_KEY, 's', "Private key file to use; default: -cert file"}, {"keyform", OPT_KEYFORM, 'E', "Key format (ENGINE, other values ignored)"}, - {"pass", OPT_PASS, 's', "Private key file pass phrase source"}, + {"pass", OPT_PASS, 's', "Private key and cert file pass phrase source"}, {"verify", OPT_VERIFY, 'p', "Turn on peer certificate verification"}, {"nameopt", OPT_NAMEOPT, 's', "Certificate subject/issuer name printing options"}, {"CApath", OPT_CAPATH, '/', "PEM format directory of CA's"}, @@ -702,7 +702,7 @@ const OPTIONS s_client_options[] = { {"keymatexport", OPT_KEYMATEXPORT, 's', "Export keying material using label"}, {"keymatexportlen", OPT_KEYMATEXPORTLEN, 'p', - "Export len bytes of keying material (default 20)"}, + "Export len bytes of keying material; default 20"}, {"security_debug", OPT_SECURITY_DEBUG, '-', "Enable security debug messages"}, {"security_debug_verbose", OPT_SECURITY_DEBUG_VERBOSE, '-', @@ -790,7 +790,7 @@ const OPTIONS s_client_options[] = { OPT_V_OPTIONS, {"CRL", OPT_CRL, '<', "CRL file to use"}, {"crl_download", OPT_CRL_DOWNLOAD, '-', "Download CRL from distribution points"}, - {"CRLform", OPT_CRLFORM, 'F', "CRL format (PEM or DER) PEM is default"}, + {"CRLform", OPT_CRLFORM, 'F', "CRL format (PEM or DER); default PEM"}, {"verify_return_error", OPT_VERIFY_RET_ERROR, '-', "Close connection on verification error"}, {"verify_quiet", OPT_VERIFY_QUIET, '-', "Restrict verify output to errors"}, @@ -1740,7 +1740,7 @@ int s_client_main(int argc, char **argv) } if (cert_file != NULL) { - cert = load_cert(cert_file, cert_format, "client certificate file"); + cert = load_cert_pass(cert_file, cert_format, pass, "client certificate file"); if (cert == NULL) goto end; } |