From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 19 Nov 2012 23:20:40 +0000 (+0000)
Subject: update usage messages
X-Git-Tag: master-post-reformat~1593
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7c8ac5050473ec938f2c2e3e5c9063d680be36a1;p=oweals%2Fopenssl.git

update usage messages
---

diff --git a/apps/s_client.c b/apps/s_client.c
index ba76a0e3bd..7d22c070f5 100644
--- 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 329f6c7083..75cf0c3480 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -475,6 +475,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 788eb7b3d0..694d2544eb 100644
--- 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
 };