diff options
author | Dmitry Belyavskiy <beldmit@gmail.com> | 2017-02-21 14:22:55 +0300 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-02-21 13:50:00 -0500 |
commit | a7c04f2b540cce99055326a3ab932032bdf48cf5 (patch) | |
tree | 09800f489155c1ea78e9bd0e70f602b54b81efa6 /apps/s_client.c | |
parent | ecca16632a73bb80ee27cdec8a97f6def0a4714d (diff) |
Provided support for the -nameopt flag in s_client, s_server and s_time
commands.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2695)
Diffstat (limited to 'apps/s_client.c')
-rw-r--r-- | apps/s_client.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 7d6eb02515..4db3748f30 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -524,7 +524,7 @@ static int tlsa_import_rrset(SSL *con, STACK_OF(OPENSSL_STRING) *rrset) typedef enum OPTION_choice { OPT_ERR = -1, OPT_EOF = 0, OPT_HELP, OPT_4, OPT_6, OPT_HOST, OPT_PORT, OPT_CONNECT, OPT_UNIX, - OPT_XMPPHOST, OPT_VERIFY, + OPT_XMPPHOST, OPT_VERIFY, OPT_NAMEOPT, OPT_CERT, OPT_CRL, OPT_CRL_DOWNLOAD, OPT_SESS_OUT, OPT_SESS_IN, OPT_CERTFORM, OPT_CRLFORM, OPT_VERIFY_RET_ERROR, OPT_VERIFY_QUIET, OPT_BRIEF, OPT_PREXIT, OPT_CRLF, OPT_QUIET, OPT_NBIO, @@ -579,6 +579,7 @@ const OPTIONS s_client_options[] = { {"cert", OPT_CERT, '<', "Certificate file to use, PEM format assumed"}, {"certform", OPT_CERTFORM, 'F', "Certificate format (PEM or DER) PEM default"}, + {"nameopt", OPT_NAMEOPT, 's', "Various certificate name options"}, {"key", OPT_KEY, 's', "Private key file to use, if not in -cert file"}, {"keyform", OPT_KEYFORM, 'E', "Key format (PEM, DER or engine) PEM default"}, {"pass", OPT_PASS, 's', "Private key file pass phrase source"}, @@ -1013,6 +1014,10 @@ int s_client_main(int argc, char **argv) case OPT_CERT: cert_file = opt_arg(); break; + case OPT_NAMEOPT: + if (!set_nameopt(opt_arg())) + goto end; + break; case OPT_CRL: crl_file = opt_arg(); break; |