Commit 7005eda3 authored by Richard Levitte's avatar Richard Levitte
Browse files

s_client and s_server take -verify_{host,email,ip}, not -check* 



RT3596
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 9a6e9942

apps/s_client.c

+3 −3
Original line number Diff line number Diff line
@@ -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");

apps/s_server.c

+3 −3
Original line number Diff line number Diff line
@@ -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");