update usage messages

(cherry picked from commit 7c8ac5050473ec938f2c2e3e5c9063d680be36a1)

diff --git a/apps/s_client.c b/apps/s_client.c
index 602cec9e90b65f3388cd95eff8fdb97264c9b8af..25bb3d6b8686a9e075ad5d37bcf8947866b1093d 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -293,6 +293,9 @@ static void sc_usage(void)
        BIO_printf(bio_err," -host host     - use -connect instead\n");
        BIO_printf(bio_err," -port port     - use -connect instead\n");
        BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR);
+       BIO_printf(bio_err," -checkhost host - check peer certificate matches \"host\"\n");
+       BIO_printf(bio_err," -checkemail email - check peer certificate matches \"email\"\n");
+       BIO_printf(bio_err," -checkip ipaddr - check peer certificate matches \"ipaddr\"\n");
 
        BIO_printf(bio_err," -verify arg   - turn on peer certificate verification\n");
        BIO_printf(bio_err," -cert arg     - certificate file to use, PEM format assumed\n");

diff --git a/apps/s_server.c b/apps/s_server.c
index 2f3f19298543e5ffd97e5960c344dd8c2c5a80f9..47b6ecd63277027cce479710d4910c5c0eb466d8 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -474,6 +474,9 @@ static void sv_usage(void)
        BIO_printf(bio_err,"usage: s_server [args ...]\n");
        BIO_printf(bio_err,"\n");
        BIO_printf(bio_err," -accept arg   - port to accept on (default is %d)\n",PORT);
+       BIO_printf(bio_err," -checkhost host - check peer certificate matches \"host\"\n");
+       BIO_printf(bio_err," -checkemail email - check peer certificate matches \"email\"\n");
+       BIO_printf(bio_err," -checkip ipaddr - check peer certificate matches \"ipaddr\"\n");
        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");

diff --git a/apps/x509.c b/apps/x509.c
index 788eb7b3d0a94ae13b8624f478107874ced073c4..694d2544ebb2c5ab5fc60262d67cf3aae4daf4fc 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -150,6 +150,9 @@ static const char *x509_usage[]={
 " -engine e       - use engine e, possibly a hardware device.\n",
 #endif
 " -certopt arg    - various certificate text options\n",
+" -checkhost host - check certificate matches \"host\"\n",
+" -checkemail email - check certificate matches \"email\"\n",
+" -checkip ipaddr - check certificate matches \"ipaddr\"\n",
 NULL
 };