From 7005eda3b6e4858233ec3d2a95ff3f5f28f8a484 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 29 Nov 2014 07:08:15 +0100 Subject: [PATCH] s_client and s_server take -verify_{host,email,ip}, not -check* RT3596 Reviewed-by: Matt Caswell --- apps/s_client.c | 6 +++--- apps/s_server.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/s_client.c b/apps/s_client.c index 43737fdcce..45ca637e30 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -291,9 +291,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_host host - check peer certificate matches \"host\"\n"); + BIO_printf(bio_err," -verify_email email - check peer certificate matches \"email\"\n"); + BIO_printf(bio_err," -verify_ip ipaddr - check peer certificate matches \"ipaddr\"\n"); BIO_printf(bio_err," -verify arg - turn on peer certificate verification\n"); BIO_printf(bio_err," -verify_return_error - return verification errors\n"); diff --git a/apps/s_server.c b/apps/s_server.c index 5eab0b5823..c608fbb8a0 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -473,9 +473,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," -verify_host host - check peer certificate matches \"host\"\n"); + BIO_printf(bio_err," -verify_email email - check peer certificate matches \"email\"\n"); + BIO_printf(bio_err," -verify_ip 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"); -- 2.25.1