diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-07-06 22:33:35 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-07-06 22:42:50 +0100 |
| commit | ee724df75d9ad67fd954253ac514fddb46f1e3c6 (patch) | |
| tree | abfe6569256eb29f051adbb36608c6eb27a7b126 | |
| parent | cba3f1c739f012aaadb85aaefaf8de424d2695e2 (diff) | |
| download | openssl-new-ee724df75d9ad67fd954253ac514fddb46f1e3c6.tar.gz | |
Usage for -hack and -prexit -verify_return_error
| -rw-r--r-- | apps/s_client.c | 2 | ||||
| -rw-r--r-- | apps/s_server.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 9f8e2b8e94..e1be6a908b 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -293,6 +293,7 @@ static void sc_usage(void) BIO_printf(bio_err," -connect host:port - connect over TCP/IP (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR); BIO_printf(bio_err," -unix path - connect over unix domain sockets\n"); BIO_printf(bio_err," -verify arg - turn on peer certificate verification\n"); + BIO_printf(bio_err," -verify_return_error - return verification errors\n"); BIO_printf(bio_err," -cert arg - certificate file to use, PEM format assumed\n"); BIO_printf(bio_err," -certform arg - certificate format (PEM or DER) PEM default\n"); BIO_printf(bio_err," -key arg - Private key file to use, in cert file if\n"); @@ -304,6 +305,7 @@ static void sc_usage(void) BIO_printf(bio_err," -trusted_first - Use local CA's first when building trust chain\n"); BIO_printf(bio_err," -reconnect - Drop and re-make the connection with the same Session-ID\n"); BIO_printf(bio_err," -pause - sleep(1) after each read(2) and write(2) system call\n"); + BIO_printf(bio_err," -prexit - print session information even on connection failure\n"); BIO_printf(bio_err," -showcerts - show all certificates in the chain\n"); BIO_printf(bio_err," -debug - extra output\n"); #ifdef WATT32 diff --git a/apps/s_server.c b/apps/s_server.c index de8fd57e29..239597e2a5 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -451,6 +451,7 @@ static void sv_usage(void) BIO_printf(bio_err," -context arg - set session ID context\n"); BIO_printf(bio_err," -verify arg - turn on peer certificate verification\n"); BIO_printf(bio_err," -Verify arg - turn on peer certificate verification, must have a cert.\n"); + BIO_printf(bio_err," -verify_return_error - return verification errors\n"); BIO_printf(bio_err," -cert arg - certificate file to use\n"); BIO_printf(bio_err," (default is %s)\n",TEST_CERT); BIO_printf(bio_err," -naccept arg - terminate after 'arg' connections\n"); @@ -530,6 +531,7 @@ static void sv_usage(void) #endif BIO_printf(bio_err, "-no_resume_ephemeral - Disable caching and tickets if ephemeral (EC)DH is used\n"); BIO_printf(bio_err," -bugs - Turn on SSL bug compatibility\n"); + BIO_printf(bio_err," -hack - workaround for early Netscape code\n"); BIO_printf(bio_err," -www - Respond to a 'GET /' with a status page\n"); BIO_printf(bio_err," -WWW - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n"); BIO_printf(bio_err," -HTTP - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n"); |